Merge branch 'master' of git@github.com:binsee/wechat-php-sdk.git

Conflicts:
	Thinkphp/Wechatext.class.php
	wechatext.class.php