Merge origin/master

Conflicts:
	Gruntfile.js
	README.md