New registration form
Merge branch 'new-registration-form' into staging