Merge remote branch 'upstream/develop' into develop-next

Conflicts:
	include/ajax.config.php
	include/ajax.content.php
	include/class.dynamic_forms.php
	include/class.export.php
	include/class.filter.php
	include/class.mailer.php
	include/class.nav.php
	include/class.orm.php
	include/class.page.php
	include/class.thread.php
	include/class.ticket.php
	include/client/open.inc.php
	include/staff/departments.inc.php
	include/staff/faq.inc.php
	include/staff/settings-access.inc.php
	include/staff/templates/content-manage.tmpl.php
	include/staff/ticket-open.inc.php
	include/staff/tickets.inc.php
	include/staff/user-view.inc.php