new index and web.js
Merge branch 'develop' into staging