Edit users

not closing it, but since its blocked I merge it to the master so I can keep on working in other features