Merge remote-tracking branch 'origin/master'

Conflicts:
	Grunt/README.md
	Grunt/presentation/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	Grunt/README.md
update and fixes