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

app/views/layouts/_side_bar.html.erb

@@ -76,6 +76,16 @@
 	<%# end -%>
 <%# end -%>
 
+<%= content_tag :li, :class => active_for_controllers('archive_files', 'tags', 'archive_file_categorys') do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.archive'), panel_archive_back_end_archive_files_path %>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
+		<%= content_tag :li, link_to(t('admin.all_articles'), panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index') %>
+		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new') %>
+		<%= content_tag :li, link_to(t('admin.categories'), panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index') %>
+		<%= content_tag :li, link_to(t('admin.tags'), panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') %>
+	<% end -%>
+<% end -%>
+
 <%= content_tag :li, :class => active_for_controllers(nil) do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %>
 <% end -%>

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-->