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

Author: mgeipel

src/test/java/org/culturegraph/mf/morph/maps/FileMap.xml

@@ -26,7 +26,11 @@
 
 				</mm:rules>
 				<mm:maps>
+<<<<<<< HEAD
 					<mm:filemap name="map1" files="maps/MARCcountries.txt" />
+=======
+					<mm:mapfile name="map1" files="maps/MARCcountries.txt" />
+>>>>>>> aa24f65812c9ff505b222ab5642df5441f81f4e9
 				</mm:maps>
 			</mm:metamorph>
 		</transformation>