Adding Grunt boilerplate
Merge branch 'grunt' into prod