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

Author: DaftMonk

Diff for: app/templates/_package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "express": "~4.0.0",
     "morgan": "~1.0.0",
-    "body-parser": "~1.0.0",
+    "body-parser": "~1.5.0",
     "method-override": "~1.0.0",
     "static-favicon": "~1.0.1",
     "cookie-parser": "~1.0.1",

Diff for: test/fixtures/package.json

@@ -3,7 +3,7 @@
   "dependencies": {
     "express": "~4.0.0",
     "morgan": "~1.0.0",
-    "body-parser": "~1.0.0",
+    "body-parser": "~1.5.0",
     "method-override": "~1.0.0",
     "static-favicon": "~1.0.1",
     "cookie-parser": "~1.0.1",