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

Conflicts:
	app/views/layouts/_side_bar.html.erb
	config/mongoid.yml
	vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css

config/mongoid.yml

@@ -9,7 +9,6 @@ defaults: &defaults
 development:
   <<: *defaults
   database: prototype_r4_development
-  
 test:
   <<: *defaults
   database: prototype_r4_test