Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrainDispatcherSimulator.v12.suo
	TrainDispatcherSimulator/bin/Debug/TrainDispatcherSimulator.exe
	TrainDispatcherSimulator/bin/Debug/TrainDispatcherSimulator.pdb
	TrainDispatcherSimulator/obj/Debug/TrainDispatcherSimulator.exe
	TrainDispatcherSimulator/obj/Debug/TrainDispatcherSimulator.g.resources
	TrainDispatcherSimulator/obj/Debug/TrainDispatcherSimulator.pdb

	TrainDispatcherSimulator/obj/Debug/TrainDispatcherSimulator_MarkupCompile.lref