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

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	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/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

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

@@ -54,7 +54,7 @@ class ArchiveFile
   def is_top?
     self.is_top
   end
-
+  
   def save_archive_file_multiples
 	self.archive_file_multiples.each do |t|
 	  if t.should_destroy

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

@@ -111,7 +111,6 @@
 			</div>
 			
 			
-		
 		</div>
 	
 <!--Post End-->

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

@@ -8,7 +8,7 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
   end
 
   def index
-  
+
   get_categorys("WebLinkCategory",params[:web_link_category_id])
   @filter = params[:filter]
   new_filter = params[:new_filter]