added login and register page
Merge origin/master