一部修正
Merge branch 'master' of https://github.com/mrdagon/SDXTowerDefence

Conflicts:
	DataType.h
	Unit.h