basic user registration
Merge branch 'registration'