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

Conflicts:
	zombie-apocalypse/Assets/Terrain/World.cs