Merge branch 'initial-as-an-attendee-page' into gh-pages