work in progress on data migration and related changes to support ISF
work on application ontology support for property/class configuration
Merge remote-tracking branch 'origin/develop' into dev-isf

Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java
updating pullProperty() to pull property/class combos
work on converting editing to be ISF compatible
continued work on ISF conversion and data migration
workaround for property editing nontermination
minor improvements
VIVO-42 support for union ranges and other related improvements
supporting qualifiedByDomain in app ontology
support for domain qualification in list views
fixes bug in list view support for domain-side qualification
support for domain qualification in property config
minor change to sparql query for domain-qualified property configs
support for edit permissions for qualified properties (almost finished)
removing debug log message
edit permissions for qualified properties and VIVO-277
fixing bugs in ApplicationConfigurationOntologyUtils.java
removing EditLinkSuppressor
display permissions for domain-qualified predicates