Merge branch 'master' of https://github.com/manilion/haoziwei

Conflicts:
	haoziwei/src/com/haozw/weixin/MessageResponser.java
Merge branch 'master' of https://github.com/manilion/haoziwei