Minify whatever js can be minified
Remove commented js
Merge branch 'master' into develop