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