Merge pull request #41 from cgolubi1/infrastructure

move grunt utilities into util/grunt/
Merge remote-tracking branch 'upstream/master' into api_nomock