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