never want this again
Merge branch 'master' of https://github.com/ppl3232/XGame

Conflicts:
	Classes/XGAIPlayer.cpp
	Classes/XGControlCenter.cpp
	Classes/XGControlCenter.h
	Classes/XGDisplay.cpp
	Classes/XGDisplay.h
	Classes/XGFootman.cpp
	Classes/XGFootman.h
	Classes/XGGameInfo.cpp
	Classes/XGGrunt.cpp
	Classes/XGGrunt.h
	Classes/XGMap.cpp
	Classes/XGMap.h
	Classes/XGPlayer.cpp
	Classes/XGPlayer.h
	Classes/XGTile.cpp
	Classes/XGTile.h
	Classes/XGUnit.cpp
	Classes/XGUnit.h