Edit users merge to master

I got edit users working, however there was the problem that I could not get users by id, so I wrote into the controller to do a list query and find the user in the id.