upgrade uglify
remove uglify option
Merge branch 'master' into gh-pages
deploy