severely broken
Merge branch 'master' into multileveledicaatom
role of controlAccess added to UR
automerge remote
Merge remote-tracking branch 'master'

controlaccess in an icaatom EAD results in an extra node. updated the tests accordingly.

Conflicts:
	ehri-importers/src/main/java/eu/ehri/project/importers/IcaAtomEadHandler.java
	ehri-importers/src/main/java/eu/ehri/project/importers/IcaAtomEadImporter.java
	ehri-importers/src/main/resources/icaatom.properties
added languagecode for both icaatom material and description
Merge branch 'master' of https://github.com/lindareijnhoudt/neo4j-ehri-plugin
into merge_linda_import.

Should fix language issues.

Conflicts:
	ehri-importers/src/main/resources/icaatom.properties
Get the code instead of the text language name. TODO: Convert to 2-letter.
Set fields as multivalued
Don't toString values when checking multi-valued strings.
Remove dead code
Add hacks for language conversion
Merge language helper hacks, which were left dangling.
Because the origination/name node now creates a relationship, we
need to adjust the tests accordingly.
Re-merge test and properties changes
More fixes to language munging.
Another attempt at merging Linda's changes, this time without
blowing away some of my previous commits.

Conflicts:
	ehri-importers/src/main/resources/icaatom.properties
	ehri-importers/src/test/java/eu/ehri/project/importers/IcaAtomEadImporterTest.java
Fix more merge fallout from being too tired at the wheel