NOJIRA get() support for annotation geometry
PROV-955 fix xpath support for namespaced attributes
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
Merge branch 'develop' of github.com:collectiveaccess/providence into develop

Conflicts:
	app/lib/ca/Import/DataReaders/BaseXMLDataReader.php
PROV-963 fixed matchOn params