Merge origin/master

Conflicts:
	KolonistenVanCatan/src/domein/Spel.java