Merge remote-tracking branch 'origin/master'

Author: Joe Alves

generated/server/db/index.js

@@ -16,8 +16,11 @@ mongoose.Promise = Promise;
 // anywhere the User model needs to be used.
 require('./models');
 
+// Modifying startDbPromise to return the db object to have an access to it when  .then on startDbPromise
 var startDbPromise = new Promise(function (resolve, reject) {
-    db.on('open', resolve);
+    db.on('open', function() {
+    	resolve(db)
+    });
     db.on('error', reject);
 });