Grunt plugin setup
Merge resolved