Fix trimming
Merge branch 'filtering' of github.com:symphonycms/symphony-2 into filtering

Conflicts:
	symphony/content/content.publish.php