Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/templates/Gruntfile.js
	package.json
	readme.md