Resources&World merged, opimized
Merge branch 'TerrainRender' into Basic_game_functionality

Conflicts:
	zombie-apocalypse/Assets/Terrain/World.cs
	zombie-apocalypse/zombie-apocalypse-csharp.sln
	zombie-apocalypse/zombie-apocalypse.sln
Merge branch 'Basic_game_functionality' of https://github.com/dorusleliveld/Zombie-Apocalypse into Basic_game_functionality