blablaabla
fix probable bug in timing request
gg
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/server/planning.xml
	src/shared/TrainInfo.java