Conflicts:
	WHATSNEW.md
	bootstrap.php
	include/ajax.users.php
	include/cli/modules/package.php
	include/client/tickets.inc.php
	include/staff/tickets.inc.php