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

Conflicts:
	src/main/java/de/hshannover/f4/trust/ironvas/Ironvas.java

	changed newline delimiter to unix