group controller
group controller
Merge branch 'trunk' of github.com:conext/rave into trunk

Conflicts:
	rave-portal/src/main/dist/bin/setenv.sh