Updated naming
Merge branch 'master' of github.com:kkirby/GsScriptProjectGrunt

Conflicts:
	package.json