Merge branch 'dev' into f/issue#38

Conflicts:
	app/views/group/explore.volt
Merge branch 'dev' into f/issue#38

Conflicts:
	app/controllers/GroupController.php
	app/models/Group.php
added test data
Merge branch 'f/issue#38' of https://github.com/waaghals/Unique-Lone-Dog into f/issue#38

Conflicts:
	sql/data.sql
Fixed role
Merge branch 'f/issue#38' of https://github.com/waaghals/Unique-Lone-Dog into f/issue#38
Fixed bug not able to remove group
Merge branch 'dev' into f/issue#38

Conflicts:
	app/controllers/GroupController.php
	app/views/group/explore.volt
Fixed bug unsubscribe in show hub
Fix double comment
Merge branch 'f/issue#38' into dev

Conflicts:
	app/views/group/partials/listItem.volt