Conflicts:

	htdocs/admin/users/suspend.php
	htdocs/js/adminusersearch.js
	htdocs/lang/en.utf8/admin.php
	htdocs/lib/db/upgrade.php
	htdocs/lib/searchlib.php
	htdocs/lib/version.php
	htdocs/search/internal/lib.php
	htdocs/theme/default/templates/admin/users/institution.tpl
	htdocs/theme/default/templates/admin/users/search.tpl
	htdocs/theme/default/templates/admin/users/suspendlink.tpl
	htdocs/theme/default/templates/admin/users/username.tpl
	htdocs/theme/default/templates/form/userlist.tpl