Update grunt plugins
Merge branch 'develop'