Merge branch 'grouprework'
Conflicts: htdocs/group/view.php htdocs/lang/en.utf8/mahara.php htdocs/lib/group.php htdocs/search/internal/lib.php
htdocs/group/delete.php
0 → 100644
htdocs/group/find.php
0 → 100644
htdocs/group/leave.php
0 → 100644
htdocs/group/mygroups.php
0 → 100644
htdocs/group/requestjoin.php
0 → 100644