Fixed bugs of index.html
Bug fix
Merge branch 'develop' into staging
Bug fix
Merge branch 'develop' into staging