Edit Home Page
Edit homepage
Merge branch '1.0-homepage'