Merge branch 'develop' into release

website/server/server.js

@@ -2,7 +2,6 @@ import nconf from 'nconf';
 import logger from './libs/logger';
 import express from 'express';
 import http from 'http';
-import Bluebird from 'bluebird';
 
 // @TODO: May need to remove - testing
 import memwatch from 'memwatch-next';
@@ -12,8 +11,6 @@ memwatch.on('leak', (info) => {
   logger.error(message);
 });
 
-global.Promise = Bluebird;
-
 const server = http.createServer();
 const app = express();