homepage updates
Merge branch 'master' into welcome-screen