Fixed logins to accept username
Merge branch 'Login' into development