add user auth
Merge branch 'feature/amilti' into dev
Merge branch 'feature/tony' into dev