registration page work
Merge branch 'registration' into dev