Person entity field arrangements
Merge branch 'themeing_run'

Conflicts:
	modules/features/rec_person_entity/rec_person_entity.features.field_instance.inc
Merge branch 'master' of github.com:ITS-UofIowa/recserv.uiowa.edu