Conflicts:
	WHATSNEW.md
	include/class.ticket.php
	include/class.topic.php
	include/staff/faq-view.inc.php
	include/staff/helptopics.inc.php