first attempt
Merge branch 'master' into local_login
allow logging in from local