spring
Merge branch 'master' of https://github.com/zjuconan/ChuangMeng

Conflicts:
	ChuangMeng/WebContent/WEB-INF/web.xml