homepage frontend edited
Merge branch 'homepage_frontend'