split sentence
Merge branch 'Lixu'
change Source
Merge branch 'Lixu2' into Cece

Conflicts:
	AndoridServer/WebContent/WEB-INF/applicationContext.xml
	AndoridServer/build/classes/.gitignore
	AndoridServer/build/classes/Action/GetList.class
	AndoridServer/build/classes/Action/Test.class
	AndoridServer/build/classes/DAO/ContentDAO.class
	AndoridServer/build/classes/Service/ContentService.class
	AndoridServer/build/classes/Service/HtmlService.class
	AndoridServer/build/classes/Service/JsonToJava.class
	AndoridServer/build/classes/Service/KeyWordService.class
	AndoridServer/build/classes/Service/SummaryService.class
	AndoridServer/build/classes/Service/Test/JsonTest.class
	AndoridServer/build/classes/Service/Test/SummaryTest.class
	AndoridServer/build/classes/domain/Content.class
	AndoridServer/src/Action/GetList.java
	AndoridServer/src/Action/Test.java
	AndoridServer/src/DAO/ContentDAO.java
	AndoridServer/src/Service/ContentService.java
	AndoridServer/src/Service/DifferentNews.java
	AndoridServer/src/Service/HtmlService.java
	AndoridServer/src/Service/JsonToJava.java
	AndoridServer/src/Service/JsonToTokens.java
	AndoridServer/src/Service/KeyWordService.java
	AndoridServer/src/Service/SearchFormat.java
	AndoridServer/src/Service/SplitService.java
	AndoridServer/src/Service/SummaryService.java
	AndoridServer/src/Service/Test/JsonTest.java
	AndoridServer/src/Service/Test/SummaryTest.java
	AndoridServer/src/domain/Content.java