Merge branch 'master' into ldap

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

app/models/ad_banner.rb

@@ -9,11 +9,16 @@ class AdBanner
 
   before_save :save_or_destroy
   validates_uniqueness_of :title
+  validates :title , :length => { :minimum => 2 }
   has_many :ad_images , dependent: :delete
   
   FX_TYPES = ["blindX","blindY","blindZ","cover","curtainX","curtainY","fade","fadeZoom","growX","growY","scrollUp","scrollDown","scrollLeft","scrollRight","scrollHorz","scrollVert","shuffle","slideX","slideY","toss","turnUp","turnDown","turnLeft","turnRight","uncover","wipe","zoom"]
   
-
+  def preview_clone
+    preview_banner = self.clone
+    preview_banner.ad_images = self.ad_images
+    preview_banner
+  end
   # def new_ad_images(*attrs)
   #   debugger
   #   a=1