Merge branch 'staging' into master

api/controllers/TargetController.js

@@ -2,6 +2,7 @@ module.exports = {
   show: function (req, res) {
     res.view('pages/temp', {
       email: req.user.email
+
     });
   }
-};
+};

api/controllers/UserController.js

@@ -37,4 +37,4 @@ module.exports = {
   me: function (req, res) {
     res.json(req.user);
   }
-};
+};

api/helpers/passport.js

@@ -168,4 +168,4 @@ function PassportHelper () {
   this.getPassport = function () {
     return passport;
   };
-}
+}

api/hooks/passport/index.js

@@ -1,5 +1,6 @@
 let passportHook = sails.hooks.passport;
 
+
 if (!passportHook) {
   passportHook = function (sails) {
     return {
@@ -12,4 +13,4 @@ if (!passportHook) {
   };
 }
 
-module.exports = passportHook;
+module.exports = passportHook;

api/models/User.js

@@ -33,4 +33,4 @@ module.exports = {
 
   }
 
-};
+};

package.json

@@ -32,7 +32,6 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
-    "@sailshq/eslint": "^4.19.3",
     "babel-loader": "^8.0.4",
     "babel-preset-es2015": "^6.24.1",
     "css-loader": "^1.0.1",