Merge remote-tracking branch 'origin/kieker-removed'

Conflicts:
	src/main/java/kieker/analysis/stage/TimeReader.java
	src/main/java/teetime/stage/io/DbReader.java
	src/main/java/teetime/stage/io/TCPReader.java
	src/main/java/teetime/stage/kieker/Dir2RecordsFilter.java
	src/main/java/teetime/stage/kieker/DirWithBin2RecordFilter.java
	src/main/java/teetime/stage/kieker/DirWithDat2RecordFilter.java
	src/main/java/teetime/stage/kieker/className/MappingFileParser.java
	src/main/java/teetime/stage/kieker/fileToRecord/RecordFromBinaryFileCreator.java
	src/main/java/util/KiekerLoadDriver.java