Builded a new build with grunt
Merge branch 'develop'