Finish log in/log out
Merge branch 'log-in-log-out'