updated Gruntfile
Merge branch 'master' into workflowTests