Merge branch 'master' into develop
Apply Grunt
Merge branch 'develop'