NTU CPH initiated

Conflicts:
	config/mongoid.yml

config/mongoid.yml

@@ -8,13 +8,11 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site
-
-
+  database: ntu_cph_orbit
 
 test:
   <<: *defaults
-  database: test_site
+  database: ntu_cph_orbit
 
 # set these environment variables on your prod server
 production:
@@ -24,4 +22,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: orbit_site_new
+  database: ntu_cph_orbit