Merge branch 'master' into token-db-updates

gulpfile.js

@@ -100,7 +100,7 @@ gulp.task('browserifyViews', () => {
     const bundler = browserify(props);
     const outputPath = pathToApp.split('/').splice(2).join('/');
 
-    var stream = bundler.bundle();
+    var stream = bundler.transform('uglifyify').bundle();
     return stream
       .on('error', (err) => {
         console.error(err);

index.js

@@ -41,17 +41,17 @@ function start() { // eslint-disable-line max-statements
   const enforcesSSL = require('express-enforces-ssl');
 
   const app = express();
-  
+
   /*
-   * Compress(gzip) all the api responses and all the static files. 
+   * Compress(gzip) all the api responses and all the static files.
    * Since this is called before the static pages and the API routes, this will
    * ensure that both the static pages and the API response are compressed.
    */
-  
+
   app.use(compress());
-  
+
   const httpServer = require('http').Server(app);
-  
+
   const io = require('socket.io')(httpServer);
   const socketIOSetup = require('./realtime/setupSocketIO');
   socketIOSetup.setupNamespace(io);

package.json

@@ -124,6 +124,7 @@
     "supertest": "^1.1.0",
     "swagger-tools": "^0.10.1",
     "throng": "^1.0.1",
+    "uglifyify": "^3.0.4",
     "underscore": "^1.8.3",
     "validator": "^4.0.2",
     "vinyl-source-stream": "^1.1.0",