grunt uglify minified build.js
Merge origin/master