Merge branch 'master' into canary

Conflicts:
	app/templates/Gruntfile.js
	app/templates/_bower.json
	test/fixtures/package.json

Author: DaftMonk

Diff for: app/templates/Gruntfile.js

@@ -16,7 +16,6 @@ module.exports = function (grunt) {
     ngtemplates: 'grunt-angular-templates',
     cdnify: 'grunt-google-cdn',
     protractor: 'grunt-protractor-runner',
-    injector: 'grunt-asset-injector',
     buildcontrol: 'grunt-build-control',
     istanbul_check_coverage: 'grunt-mocha-istanbul'
   });

Diff for: app/templates/_bower.json

@@ -4,8 +4,7 @@
   "dependencies": {
     "angular": ">=1.2.*",
     "json3": "~3.3.1",
-    "es5-shim": "~3.0.1",
-    "jquery": "~1.11.0",<% if (filters.bootstrap) { %><% if (filters.sass) { %>
+    "es5-shim": "~3.0.1",<% if(filters.bootstrap) { %><% if (filters.sass) { %>
     "bootstrap-sass-official": "~3.1.1",<% } %>
     "bootstrap": "~3.1.1",<% } %>
     "angular-resource": ">=1.2.*",

Diff for: app/templates/_package.json

@@ -60,7 +60,7 @@
     "grunt-angular-templates": "^0.5.4",
     "grunt-dom-munger": "^3.4.0",
     "grunt-protractor-runner": "^1.1.0",
-    "grunt-asset-injector": "^0.1.0",
+    "grunt-injector": "~0.5.4",
     "grunt-karma": "~0.8.2",
     "grunt-build-control": "DaftMonk/grunt-build-control",<% if (filters.sass) { %>
     "grunt-contrib-sass": "^0.7.3",<% } %><% if (filters.stylus) { %>

Diff for: app/templates/server/routes.js

@@ -5,6 +5,7 @@
 'use strict';
 
 var errors = require('./components/errors');
+var path = require('path');
 
 module.exports = function(app) {
 
@@ -21,6 +22,6 @@ module.exports = function(app) {
   // All other routes should redirect to the index.html
   app.route('/*')
     .get(function(req, res) {
-      res.sendfile(app.get('appPath') + '/index.html');
+      res.sendFile(path.resolve(app.get('appPath') + '/index.html'));
     });
 };

Diff for: readme.md

@@ -198,7 +198,7 @@ Produces:
     client/app/myService/myService.service.spec.js
 
 
-You can also do `yo angular:factory` and `yo angular:provider` for other types of services.
+You can also do `yo angular-fullstack:factory` and `yo angular-fullstack:provider` for other types of services.
 
 ### Decorator
 Generates an AngularJS service decorator.