Switched over to grunt instead of gulp
Added missing global grunt-cli package
Merge branch 'develop'