Add grunt and composer to install
Merge branch 'release-1.1' into develop
Start 1.2