Grunt file for build and deploy
Merging Master