add compare
last change
coded by cece
Merge branch 'Lixu2' into Cece

Conflicts:
	AndoridServer/WebContent/WEB-INF/applicationContext.xml
	AndoridServer/build/classes/Action/GetList.class
	AndoridServer/build/classes/Action/Spider.class
	AndoridServer/build/classes/Service/ContentService.class
	AndoridServer/build/classes/Service/DifferentNewsService.class
	AndoridServer/build/classes/Service/HtmlService.class
	AndoridServer/build/classes/Service/KeyWordService.class
	AndoridServer/build/classes/Service/SpiderService.class
	AndoridServer/build/classes/Service/SummaryService.class
	AndoridServer/build/classes/Service/Test/SummaryTest.class
	AndoridServer/build/classes/domain/Content.class
	AndoridServer/build/classes/domain/Content.hbm.xml
	AndoridServer/src/Action/GetList.java
	AndoridServer/src/Service/KeyWordService.java
	AndoridServer/src/domain/Content.hbm.xml
	AndoridServer/src/domain/Content.java