residency hours -> login/logout
Merge origin/master