Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard

Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb

vendor/built_in_modules/archive/app/models/archive_file.rb

@@ -6,12 +6,7 @@ class ArchiveFile
   include Mongoid::MultiParameterAttributes
 
   PAYMENT_TYPES = @site_valid_locales
-  
-<<<<<<< HEAD
-=======
-  PAYMENT_TYPES = @site_valid_locales
-  
->>>>>>> archive checkbox
+
   has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   
   has_and_belongs_to_many :tags, :class_name => "ArchiveTag"
@@ -36,7 +31,7 @@ class ArchiveFile
   def self.search( category_id = nil )
   
 	if category_id.to_s.size > 0
-
+    
 	  find(:all, :conditions => {archive_file_category_id: category_id}).desc( :is_top, :title )
 
 	else

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb

@@ -70,7 +70,6 @@
 				<% end %>
 				
 			</div>
-
 			
 			
 			<div>
@@ -112,7 +111,6 @@
 			</div>
 			
 			
-		
 		</div>
 	
 <!--Post End-->