Merge branch 'master' into canary

Conflicts:
	app/templates/Gruntfile.js
	app/templates/_bower.json
	test/fixtures/package.json
Merge remote-tracking branch 'origin/canary' into ngdocs

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