Merge branch 'master' into gh-pages
fix js
Merge branch 'gh-pages'