Adding Grunt as local dependency.
Merge remote-tracking branch 'local/develop' into develop