fix js path
Merge branch 'master' into gh-pages
compile after bug fix