Provoke issue described in #164 in test.
Merge branch 'develop' into issue164-undefined_kind_in_entities
Merge branch 'staging' into issue164-undefined_kind_in_entities

Conflicts:
	test/unit/ontology_import_xml_test.rb
Merge branch 'staging' into issue164-undefined_kind_in_entities
Get entity name and kind from other entity with same text if undefined in hets XML output. Workaround for #164.
Changed code, because hets bug got fixed. Fixes #164.
Merge branch 'issue164-undefined_kind_in_entities' into staging
checkout file for specific version
Merge branch 'correcting405_send_correct_version_to_hets' into develop