update map render
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final Project/Debug/Final Project.exe
	Final Project/Debug/Final Project.ilk
	Final Project/Debug/Final Project.pdb
	Final Project/Final Project.sdf
	Final Project/Final Project.v12.suo
	Final Project/Final Project/Debug/Entity.obj
	Final Project/Final Project/Debug/Final Project.log
	Final Project/Final Project/Debug/Final Project.tlog/CL.write.1.tlog
	Final Project/Final Project/Debug/Final
Project.tlog/link.command.1.tlog
	Final Project/Final Project/Debug/Final Project.tlog/link.read.1.tlog
	Final Project/Final Project/Debug/GameApp.obj
	Final Project/Final Project/Debug/Player.obj
	Final Project/Final Project/Debug/Sprite.obj
	Final Project/Final Project/Debug/UIElement.obj
	Final Project/Final Project/Debug/UIList.obj
	Final Project/Final Project/Debug/UIText.obj
	Final Project/Final Project/Debug/Weapon.obj
	Final Project/Final Project/Debug/main.obj
	Final Project/Final Project/Debug/vc120.idb
	Final Project/Final Project/Debug/vc120.pdb
	Final Project/Final Project/GameApp.h