Add stubs for "the end" screens
Merge branch 'master' into gh-pages