Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

app/views/devise/sessions/new.html.erb

@@ -7,7 +7,7 @@
 <div id="container" class="sign-in">
 	<%= form_for :user, :url => user_session_path, :html => {:class => 'user_new form-horizontal'} do |f| %>
 		<div class="content">
-			<p class="notice hide">Notice</p>
+			<p class="notice label label-warning">Notice</p>
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">