Gruntfile updated
Merge branch 'master' of https://github.com/Makio64/Template

Conflicts:
	GruntFile.js