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/_privilege_user.html.erb

app/controllers/admin/ad_banners_controller.rb

@@ -45,8 +45,8 @@ class Admin::AdBannersController < ApplicationController
   end
   
   def realtime_preview
-    @ad_banner = AdBanner.first(conditions: { title: params[:title] }).preview_clone
-    #@ad_banner.update_attributes(params[:ad_banner]).update_attributes(params[:ad_images])
+    @ad_banner = AdBanner.find( params[:id] ).preview_clone
+    @ad_banner.update_attributes(params[:ad_banner])#.update_attributes(params[:ad_images])
   end
   
   def index