fix index page
Merge branch 'develop'