Update grunt file.
Merge branch 'development' into buttons

* development: