MOTM-959: cleaner commit

Conflicts:
	plugins/debate/smarty_camp_plugins/block.debate_form.php
Merge pull request #496 from m038/MOTM-959-master-port

MOTM-959: cleaner commit