Merge branch 'hotfix/1.1.51'
Merge branch 'release/1.2.0'
added grunt-cli to dev dep
bumped version
Merge branch 'hotfix/1.2.1' into develop