Merge branch 'release/1.1.37' into develop
re-added grunt-cli dep
bumped version
re-added grunt-cli dep