Merge branch 'coolRegistrationPage'
Merge branch 'nameRefactoring'
Merge branch 'newDesign'