commit before merge
Merge branch 'master' of https://github.com/DaftMonk/generator-angular-fullstack

Conflicts:
	Gruntfile.js
	app/templates/Gruntfile.js
	app/templates/_bower.json
	app/templates/_package.json
	app/templates/server/config/express.js
	app/templates/server/routes.js
	package.json
	readme.md
	test/fixtures/package.json
	test/test-file-creation.js