Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad

Conflicts:
	config/mongoid.yml

app/controllers/admin/assets_controller.rb

@@ -35,7 +35,7 @@ class Admin::AssetsController < OrbitBackendController
       respond_to do |format|
         format.js {
           if params[:uploader]
-            render 'create'
+            render "create"
           else
             render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil}
           end