Conflicts:
	assets/default/css/theme.css
	include/client/tickets.inc.php
	include/staff/templates/tickets.tmpl.php
	include/staff/ticket-view.inc.php
	include/staff/tickets.inc.php
	scp/css/scp.css