refactor user auth
Merge branch 'master' into dev