Merge branch 'ad_banner' into ldap

app/assets/stylesheets/site_editor.css.erb

@@ -5,6 +5,10 @@
  *= require reset
  *= require_self
  *= require message
+ *= require bootstrap
+ *= require style
+ *= require bootstrap-orbit
+ *= require scroll_style
  *= require site_items
  *= require sidebar
 */