Merge branch 'daniel/landing-page-for-everyone'