add user
Merge branch 'add-user'