fix bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	foltext.php
	twitteroauth/OAuth.php
	twitteroauth/twitteroauth.php