person info and change user to person
Merge branch 'person_info'
merge people_info