Front end design of homepage
Merge branch 'master' into gn-phase-2
Merge branch 'gn-phase-2'
fixed conflict on index