Merge remote-tracking branch 'origin/master'

Author: joedotjs

generated/.eslintrc

@@ -21,6 +21,7 @@
 
   "env": {
     "browser": 1,     // browser global variables.
+    "es6": 1,         // ES6 activate!
     "node": 1,        // Node.js global variables and Node.js-specific rules.
     "amd": 0,         // defines require() and define() as global variables as per the amd spec.
     "mocha": 1,       // adds all of the Mocha testing global variables.
@@ -215,4 +216,4 @@
     "no-bitwise": 0,      // disallow use of bitwise operators (off by default)
     "no-plusplus": 0      // disallow use of unary operators, ++ and -- (off by default)
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsg",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Fullstack, generate!",
   "bin": {
     "fsg": "bin/fsg"