Conflicts:
	client.inc.php
	include/class.file.php
	include/class.mailer.php
	include/class.staff.php
	include/class.thread.php
	include/staff/ticket-view.inc.php