Fixed navigating back to Login screen after setting preferred location on first login
Merge branch 'development' of https://github.com/barterli/barterli_android into development