change Source
add compare
last change
coded by cece
details
detail
Merge remote-tracking branch 'origin/Lixu2' into Lixu2

Conflicts:
	AndoridServer/WebContent/WEB-INF/applicationContext.xml
	AndoridServer/build/classes/.gitignore
	AndoridServer/build/classes/Service/HtmlService.class
	AndoridServer/build/classes/Service/Test/SummaryTest.class
	AndoridServer/build/classes/domain/Content.class
	AndoridServer/nbproject/project.properties
	AndoridServer/src/domain/Content.java
bu dong
delete class -- CECE
time line/spilt sentence
ok
以title的方式获取相关新闻
Map achieved
delete class
Merge branch '17-lixu' into Cece-From-17

Conflicts:
	AndoridServer/WebContent/WEB-INF/applicationContext.xml
修复getSimilar bug
add chooseService
Merge branch '17-lixu' into Cece-From-17
format the service
format the service: delete classes