edit person
Merge branch 'editPerson' into development