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

Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -184,6 +184,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     end
   end
   
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb

@@ -4,14 +4,6 @@
 			<%= bulletin_category.key %>
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
-					<% if is_manager? %>
-
-							<%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>  <br/ >
-							<% bulletin_category.object_auths.each do |obj_auth| %>
-								 <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth,:token => @module_app.token)  %><br />
-							<% end %>
-					<% end %>	
-
 					<li><%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
 					<li><%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %></li>
 					<li><%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -101,7 +101,7 @@
   
 	</div>
   
-  
+
 <!--Wiget End-->
 <!--Post Start-->