login and registration
Merge branch 'login'