changes to web and index
Merge branch 'develop' into staging