Done home page
Merge branch 'develop'