Edited html stuff in index.html
Merge branch 'develop' into staging