public js minified
Merge branch 'master' into history