World Generation
Updated Renderer to allow changing UI.
Getting the world up and running
Load tiles from a JSON file
User file
Merge pull request #1 from mmbob/tile_loading

Tile loading
Fixing some problems with loading
Merge remote-tracking branch 'origin/master' into Box2D

Conflicts:
	.gitignore
	Client/Game.vcxproj
	Client/Game.vcxproj.filters
	Client/Source/DirectX.cpp
	Client/Source/DirectX.h
	Client/Source/Engine.cpp
	Client/Source/Engine.h
	Client/Source/Entity.cpp
	Client/Source/Entity.h
	Client/Source/Game.cpp
	Client/Source/Game.h
	Client/Source/GameWorld.h
	Client/Source/Player.cpp
	Client/Source/Player.h
	Client/Source/RenderObject.cpp
	Client/Source/RenderObject.h
	Client/Source/Renderer.cpp
	Client/Source/Renderer.h
	Client/Source/SanityCrystal.cpp
	Game.v12.suo