Updated Grunfile.js & index.html
Gruntfile.js spaces fix
Merge branch 'master' into navigation

Conflicts:
	Gruntfile.js
	src/index.html