update
Merge branch 'master' of https://github.com/linking12/WeiChat.git

Conflicts:
	src/main/resources/META-INF/mvc/spring-servlet.xml
	src/main/webapp/WEB-INF/web.xml