Merge branch 'master' of github.com:angular-fullstack/generator-angular-fullstack

Author: Awk34

Diff for: package.json

@@ -35,7 +35,7 @@
     "prepublish": "gulp build"
   },
   "dependencies": {
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^7.0.0",
     "babel-plugin-syntax-class-properties": "^6.13.0",
     "babel-plugin-syntax-flow": "^6.13.0",
     "babel-plugin-transform-flow-strip-types": "^6.14.0",