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