Conflicts:

	htdocs/lang/en.utf8/mahara.php
	htdocs/lib/activity.php
	htdocs/lib/db/upgrade.php
	htdocs/lib/version.php
	htdocs/theme/default/templates/form/userlist.tpl