NOJIRA allow 'label' or 'labels' for matchon
PROV-1011 implement matchOn for mappings
Merge branch 'develop' of github.com:collectiveaccess/providence into develop

Conflicts:
	app/models/ca_data_importer_items.php