Stabile version
Merge branch 'master' of https://github.com/ZimonD/ContextCG7

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

	src/server/src/main/java/disastercontrol/disaster/EarthquakeGenerator.java