Conflict ID:2
Merge branch '1.0.1-dev' of
https://github.com/weiyufeng/wechat-httpClient.git into 1.0.1-dev

Conflicts:
	README.md