log4j   整好啦
Merge branch 'develop' of github.com:CenturyWarDesign/Intelligent_Server into develop

Conflicts:
	src/com/centurywar/Main.java