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

Author: Awk34

Diff for: CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="3.6.1"></a>
+# [3.6.1](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.6.0...v3.6.1) (2016-04-23)
+
+
+### Bug Fixes
+
+* **package:** revert to Grunt 0.4.5 if user chooses Grunt ([1cc91a3](https://github.com/angular-fullstack/generator-angular-fullstack/commit/1cc91a3)), closes [#1815](https://github.com/angular-fullstack/generator-angular-fullstack/issues/1815)
+
+
+
 <a name="3.6.0"></a>
 # [3.6.0](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.5.0...v3.6.0) (2016-04-21)
 

Diff for: angular-fullstack-deps

@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-fullstack",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node",
   "keywords": [
     "yeoman-generator",

Diff for: package.json

@@ -98,7 +98,7 @@
     "run-sequence": "^1.1.0",
     "lazypipe": "^1.0.1",
     "wiredep": "^2.2.2",<% } /*end gulp*/ if(filters.grunt) { %>
-    "grunt": "^1.0.1",
+    "grunt": "^0.4.5",
     "grunt-wiredep": "^2.0.0",
     "grunt-concurrent": "^2.0.1",
     "grunt-contrib-clean": "^1.0.0",