Merge branch 'origin/master'

Conflicts:
	templates/common/root/_package.json (grunt packages updated)