Conflicts:
	src/core/event/Event.java
	src/core/zone/TypedZone.java
	src/graphics/graphical_abstraction/GraphicsMasterAbstraction.java
	src/graphics/guiSkeleton/DummyForTest/DotyEntityDisplayer.java
	src/graphics/guiSkeleton/DummyForTest/DotyRelayer.java
	src/graphics/guiSkeleton/DummyForTest/DummyLocalCore.java
	src/graphics/guiSkeleton/GUIPanel/MultiPlayerPanel.java
	src/graphics/guiSkeleton/GraphicsMaster.java
	src/map_generation/map/Surface.java