Added edit user, changed models
Conflict resolved