Merge branch 'f/issue#38' into dev

Conflicts:
	app/controllers/GroupController.php
	app/models/Group.php
	app/views/group/explore.volt
Merge branch 'dev' into f/issue#38

Conflicts:
	app/controllers/GroupController.php
	app/views/group/explore.volt