added user edit
merged master
user edit fix