Merge branch 'master' into dev
Updates
Install Grunt
Merge branch 'dev'