Conflicts:
	include/class.ticket.php
	include/class.user.php
	include/i18n/en_US/help/tips/settings.alerts.yaml
	include/staff/department.inc.php
	include/staff/settings-alerts.inc.php
	include/staff/slaplan.inc.php
	include/staff/ticket-view.inc.php