Show single group
Merge branch 'dev' into f/#3

Conflicts:
	app/config/config.php
	app/controllers/ItemController.php
	app/models/User.php
Merge branch 'f/#3' into dev