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

.gitattributes

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 
-<!--
-    This configuration file was written by the eclipse-cs plugin configuration editor
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration editor
 -->
-<!--
-    Checkstyle-Configuration: Metafacture
-    Description: none
+<!--
+    Checkstyle-Configuration: Metafacture
+    Description: none
 -->
 <module name="Checker">
   <property name="severity" value="warning"/>