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

Conflicts:
	app/views/layouts/_side_bar.html.erb

app/controllers/admin/object_auths_new_interface_controller.rb

@@ -1,6 +1,5 @@
 class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
   include OrbitCoreLib::PermissionUnility
-
   before_filter :force_order
   
   

app/helpers/application_helper.rb

@@ -172,6 +172,10 @@ module ApplicationHelper
     locale.to_sym == I18n.locale ? 'active in': ''
   end
 
+  def at_least_module_manager
+      is_manager? || is_admin? 
+  end
+  
   def dislpay_view_count(object)
     "#{t(:view_count)}: #{object.view_count}"
   end

app/models/ad_banner.rb

@@ -3,7 +3,7 @@ class AdBanner
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
   include OrbitCoreLib::ObjectAuthable
-  
+
   field :title
   field :transition_msec,type: Integer
   field :ad_fx  #TODO Design should explain