school
Merge branch 'master' of https://github.com/LuciusYu/TownSimulator.git

Conflicts:
	TownSimulator/src/com/TownSimulator/ai/btnimpls/general/GeneralBTN.java
	TownSimulator/src/com/TownSimulator/driver/Driver.java
	TownSimulator/src/com/TownSimulator/entity/JobType.java
	TownSimulator/src/com/TownSimulator/entity/ManInfo.java
	TownSimulator/src/com/TownSimulator/entity/building/BuildingType.java
	TownSimulator/src/com/TownSimulator/ui/screen/GameScreenUI.java