fixed login button now showing after logout of previous session
Merge branch 'master' into development
login button now resets when login fails