minifyjs
Merge branch 'minify'