Spam marking

Mark as spam if any KW shows up
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/BodyThreat.php