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

Conflicts:
	Thinkphp/Wechat.class.php
	Thinkphp/Wechatext.class.php
	wechat.class.php
	wechat.js