Merge branch 'design_team' into ldap

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

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb

@@ -24,7 +24,9 @@
 <%= content_tag :div do -%>
 	<% form_tag :action => "update_setting"  do %>
 		<%= render :partial => "privilege_user", :locals => {:users => @users_array} %>
-		<%= submit_tag "Update" %>
+	<div class="form-actions pagination-centered">
+	<%= submit_tag "Update", :class => 'btn' %>
+	</div>
 	<% end -%>
 <% end -%>
 </div>