集成测试，与微信平台的集成
修改测试
test
修改
修改
Merge branch 'master' of https://github.com/linking12/WeiChat.git

Conflicts:
	src/main/java/net/chat/controllers/IntegrationWX.java
	src/main/java/net/chat/integration/test/HttpClientTest.java
	src/main/java/net/chat/service/impl/CustomMenuServiceImpl.java
	src/main/resources/META-INF/spring/spring-security.xml
	src/main/webapp/WEB-INF/error.log
	src/main/webapp/WEB-INF/resources/css/css.css
	src/main/webapp/WEB-INF/resources/images/ic_1.png
	src/main/webapp/WEB-INF/resources/images/ic_2.png
	src/main/webapp/WEB-INF/resources/images/ic_3.png