Sign in/out, part 8 start
Merge branch 'sign-in-out'