Merge branch 'design_team' into ldap

Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

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

@@ -5,11 +5,11 @@
 
 	<%= flash_messages %>
 <div id="container" class="sign-in">
-	<% flash.each do |key, msg| %>
-    <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
-  <% end%>
 	<%= form_for :user, :url => user_session_path, :html => {:class => 'user_new form-horizontal'} do |f| %>
 		<div class="content">
+			 <% flash.each do |key, msg| %>
+		    <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
+		  <% end%>
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">