Highscore now fully functional

Ignored thijs's extinction test as well.
Merge branch 'master' of https://github.com/ZimonD/ContextCG7

Conflicts:

	src/server/src/test/java/disastercontrol/processor/ExtinctionProccessorIntergration.java