Lose weight
sync source code
重构目录
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.gitignore
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	WebContent/WEB-INF/spring-servlet.xml
	config/applicationContext.xml
	pom.xml