Simulation replaces GameMaster
Merge branch 'master' of https://github.com/DanielBruegmann/wota

Conflicts:
	src/de/wota/SimulationInstance.java