Add updated GruntFile.js
Merge branch 'hotfix/gruntProcess'

Conflicts:
	Gruntfile.js
	grunt_config.json