Case group management
Merge branch 'groups'

Conflicts:
	app/index.html