Added 'type' field to person field group.
Merge branch 'person-type' into develop