add edit user
Merge branch 'user_model'