lastversionNextmerge
Merge branch 'Regnak' of https://github.com/CoOz/survivalproject into Regnak

Conflicts:
	source/cdjv/game/survival/MapWorld.hx
	source/cdjv/game/survival/PlayState.hx