More work on the enter-group
Merge branch 'master' of https://github.com/carylF/DB

Conflicts:
	action.php
	enter-group.php