changed line delimiters to unix
Merge branch 'test' into checkstyle-integration

Conflicts:
	src/test/java/de/hshannover/f4/trust/ifmapj/identifier/ExtendedIdentifierTest.java

	changed line delimiters to unix