-Added fixes to gruntfile
-Working on publishing npm package
Merge branch 'develop' of https://github.com/hal313/template-manager into develop

Conflicts:
	package.json