add grunt to project
Merge branch 'master' into e2e

merging latest