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
add config
修改配置文件
增加财付通集成代码
修改支付代码
Merge branch 'master' of https://github.com/linking12/WeiChat.git

Conflicts:
	src/main/resources/META-INF/sql/WeiChat.sql