JS minify
Merge branch 'master' into lot-2