fixed #39
Merge branch 'master' of ssh://github.com/culturegraph/metafacture-core

Conflicts:
	src/main/resources/morph-maps.properties
	src/test/java/org/culturegraph/mf/morph/maps/FileMap.xml