重构
重构
Merge branch 'master' of github.com:icatholic/weixin

Conflicts:
	lib/Weixin/Client.php
	lib/Weixin/Exception.php
	lib/Weixin/Manager/Groups.php
	lib/Weixin/Manager/Media.php
	lib/Weixin/Manager/Msg.php
	lib/Weixin/Manager/Msg/Custom.php
	lib/Weixin/Manager/Msg/Reply.php