Twitter connector: fix smarty issue
Merge remote-tracking branch 'upstream/master'

Conflicts:
	twitter/twitter.php