测试，各位注意备份
Merge branch 'master' of https://github.com/DengZuoheng/teamPojectFor12SE

Conflicts:
	Hd01/.classpath
	Hd_02/info.xml
	Hd_02/src/cm/ui/ClientInterface.java
	Hd_02/src/cm/utils/SpiderUtils.java