Conflicts:
	WHATSNEW.md
	include/class.dynamic_forms.php
	include/class.mailer.php
	include/class.thread.php
	include/class.ticket.php
	include/staff/filter.inc.php