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