Done some refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	batch-layer/src/main/java/be/raildelays/batch/processor/SearchNextTrainProcessor.java