updated web.js
Merge branch 'develop' into staging
fix bugs.
Merge branch 'develop' into staging