finish login and logout
Merge branch 'login'
finish login and logout