Group stuff and stuff
Merge branch 'master' of https://github.com/conradhappeliv/grubeez

Conflicts:
	php/classes/Group.class.php