Gruntfile revision.
Resolve issues;

Conflicts:
	Gruntfile.js
	package.json