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

Author: Awk34

.travis.yml

@@ -1,15 +1,15 @@
 sudo: false
 language: node_js
 node_js:
-  - 4.2.2
+  - 4.2.3
 env:
   global:
     - SAUCE_USERNAME=fullstack_ci
     - SAUCE_ACCESS_KEY=1a527ca6-4aa5-4618-86ce-0278bf158cbf
 matrix:
   fast_finish: true
   allow_failures:
-    - node_js: 5.0.0
+    - node_js: 5.1.1
 before_install:
   - ./scripts/sauce_connect_setup.sh
   - gem update --system

angular-fullstack-deps

@@ -1,10 +1,10 @@
 language: node_js
 node_js:
-  - 4.2.2
+  - 4.2.3
 matrix:
   fast_finish: true
   allow_failures:
-    - node_js: 5.0.0
+    - node_js: 5.1.1
 before_script:
   - npm install -g bower grunt-cli<% if (filters.sass) { %>
   - gem install sass<% } %>

app/templates/.travis.yml

@@ -7,7 +7,7 @@ This project was generated with the [Angular Full-Stack Generator](https://githu
 ### Prerequisites
 
 - [Git](https://git-scm.com/)
-- [Node.js and NPM](nodejs.org) >= v0.12.0
+- [Node.js and npm](nodejs.org) Node ^4.2.3, npm ^2.14.7
 - [Bower](bower.io) (`npm install --global bower`)<% if(filters.sass) { %>
 - [Ruby](https://www.ruby-lang.org) and then `gem install sass`<% } if(filters.grunt) { %>
 - [Grunt](http://gruntjs.com/) (`npm install --global grunt-cli`)<% } if(filters.gulp) { %>

app/templates/README.md

@@ -110,7 +110,7 @@
     "supertest": "^1.1.0"
   },
   "engines": {
-    "node": "^4.2.2",
+    "node": "^4.2.3",
     "npm": "^2.14.7"
   },
   "scripts": {

app/templates/_package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-angular-fullstack",
-  "version": "3.0.0-rc9",
+  "version": "3.0.1",
   "description": "Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node",
   "keywords": [
     "yeoman-generator",
@@ -62,7 +62,7 @@
     "yeoman-assert": "^2.0.0"
   },
   "engines": {
-    "node": "^4.2.2",
+    "node": "^4.2.3",
     "npm": "^2.14.7"
   },
   "license": "BSD-2-Clause"