add home page and make some changes
Merge branch 'master' into home_page