Add users
Update model user
Merge branch 'feature/users' into develop