Add grunt-nodemon and grunt-concurrent
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into addGruntNodemon

Conflicts:
	client/dist/main.min.js.map
Merge branch 'addGruntNodemon' into develop