Score is now correct with the world

Only thing that remains: ask clients for their names and couple that to
the clients
Merge branch 'master' of https://github.com/ZimonD/ContextCG7

Conflicts:
	src/server/src/main/java/disastercontrol/DisasterControl.java