Display users groups in slave mode
Merge branch 'jag/users-show-groups-in-slave'

Conflicts:
	main/users/ChangeLog