Login/logout
Merge branch 'master' of https://github.com/shangtee/FBU

Merge conflicts