Disallow object and embed tags; adds YouTube backward compat workaround
Add Vimeo backwards compat for no object tags
Merge branch 'hotfix/htmlfilter'
SpamCheck - save attributes only if we have a userid
Flagging check for userid
An extra sanity check to spare my error logs
Merge branch 'master' into release/2.2

Conflicts:
	index.php