Conflicts:
	Simulation.cpp
	Simulation.h
	events/EventManager.cpp
	general/ArgumentParser.cpp
	general/ArgumentParser.h
	general/Macros.h
	inputfiles/events/Schule/traffic.xml
	main.cpp
	mpi/LCGrid.cpp
	mpi/LCGrid.h
	routing/GlobalRouter.cpp
	routing/GlobalRouter.h