nojira - make merge happier
Merge branch 'master' of https://github.com/collectionspace/application
NOJIRA: Add rules to xmlmerge.properties to support modifying authority instances.
Merge pull request #16 from ray-lee/212dddaeb6952baaaf0d8f186a01d1bb02e6a7a0

Update to xmlmerge.properties
Merge branch 'master' of https://github.com/collectionspace/application
CSPACE-5078: Remove concept-material and concept-activity from narrowerContext and broaderContext.
CSPACE-4996 Updated namespaces uischema to have per-instance properties, including nptAllowed. Defaults to true if not set. Added example of false setting in one of the test person vocabs.
Merge branch 'CSPACE-4996'
CSPACE-4996 Fixed problem with too many type decls.
Merge branch 'CSPACE-4996'
CSPACE-5074, CSPACE-5116: Add 'City' to placeType options; improve comments in base-authority-place.xml re: sources of options; tie geoReferencedBy field to person, org authorities; update related test files
Merge pull request #17 from rjaffe/place-2.4Fixes

CSPACE-5074, CSPACE-5116: Add 'City' to placeType options; improve comme...
Merge branch 'master' of https://github.com/collectionspace/application
nojira - documentation
nojira - more documentation
nojira - documentation
CSPACE-5128: Convert seven date fields to be structured dates
CSPACE-5030: Add id attribute to all sections in default config files.
CSPACE-5145: reconfiguring person, instance-vocabularies for termGroup
CSPACE-5145: First bit of work - not ready for use yet.