Fixing bug in index.html dev branch
Merge branch 'develop' into staging