added grunt-cli to dev dep
bumped version
Merge branch 'hotfix/1.2.1'