Avoid a possible circular redirect
Merge branch 'develop' of https://github.com/KwaMoja/KwaMoja into develop
Ensure that the login screen itself never times out
Merge pull request #563 from timschofield/develop

Develop