CSPACE-5767: Computed Current Location field value now displays just display name, not entire refName / URN. Still need to update test datafiles to reflect this change.
CSPACE-5767: Minor cleanup: make case consistent in uitype string example (although any case will match), augment comment about a string check for null/blank.
CSPACE-5767: Updated App layer test datafile to reflect Cataloging / CollectionObject uispec change.
Merge pull request #68 from aronr/CSPACE-5767

CSPACE-5767: Render display name, not refName ...
CSPACE-5794: Advanced search on Term Status (Status) field in Concept no longer returns an error message.
CSPACE-5794: Updating Concept uischema test datafile.
Merge pull request #70 from aronr/CSPACE-5794

CSPACE-5794: Concept advanced search on Term Status field no longer errors.
Merge branch 'master' into PAHMA-632

Conflicts:
	cspi-webui/src/main/java/org/collectionspace/chain/csp/webui/nuispec/SchemaStructure.java