Conflicts:

	htdocs/admin/users/admins.php
	htdocs/admin/users/notifications.php
	htdocs/group/create.php
	htdocs/group/edit.php
	htdocs/lang/en.utf8/activity.php
	htdocs/lib/activity.php
	htdocs/lib/db/upgrade.php
	htdocs/lib/form/elements/userlist.php
	htdocs/lib/group.php
	htdocs/lib/version.php
	htdocs/search/internal/lib.php
	htdocs/theme/default/templates/form/userlist.tpl