updates for restricting broader/narrower term to adding individuals with most specific type of concept, and updates to isPersonType for new individual form
update to new individual to make sure type of new gets passed
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6
updating field options constructor
Merge branch 'maint-rel-1.6' into develop

Conflicts:
	src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop