添加微信模块的回复、欢迎
Merge branch 'master' of https://github.com/jakemanase/BoxinIMS

Conflicts:
	src/main/webapp/WEB-INF/views/modules/wechat/newsReplyForm.jsp