Split login and logout to their own file
Merge branch 'develop' into feature/mine-logic