Rename TileMap to TileLoader
Merge branch 'master' of https://github.com/vsrz/CS699

Conflicts:
	GS/src/World.cpp