Fixed some bugs in user edit_company/person
Merge branch 'devgeoff'