befor merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/edu/hm/hafner/util/ByteStreamsTest.java
formatierung
Merge branch 'master' of git@github.com:habast/config.git

Conflicts:
	src/test/java/edu/hm/hafner/util/ByteStreamsTest.java