Fixing web.js
Merge branch 'develop' into staging
Adding google analytics to new index.html
Merge branch 'develop' into staging