Profile editing added, no overlap names.
Merge branch 'master' into new-master