commit all .js
Merge branch 'iii_branch'