Did what I do best again :)
Merge branch 'master' of https://github.com/bstroosnijder/KB06

Conflicts:
	src/Game/Terrain.cpp