1235 - auth
Merge branch '1234-bug-login' into dev