Merge branch 'design_team' into ldap

Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css

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

@@ -23,8 +23,8 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
   
   def show
-    @bulletin = Bulletin.can_display.where.where(_id: params[:id])
-	get_categorys
+    @bulletin = Bulletin.can_display.where(_id: params[:id]).first
+    get_categorys
   end