edit-details & edit pasword almost finished
Merge origin/master
Merge origin/master
Merge origin/master