added the new js
Merge branch 'master' into beta