small fixes
Merge remote-tracking branch 'origin/TerrainRender' into TerrainRender

Conflicts:
	zombie-apocalypse/Assets/Terrain/World.cs
Voor roel
Merge branch 'Basic_game_functionality' of https://github.com/Group05/Zombie-Apocalypse into Basic_game_functionality
Edits
Merge
Bugfixes