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

Conflicts:
	include/class.dynamic_forms.php
	include/class.mailer.php
	include/class.organization.php
	include/class.orm.php
	include/class.user.php
	include/client/templates/dynamic-form.tmpl.php
	include/client/view.inc.php
	scp/lists.php