fixes #1241
Merge branch 'master' into bug/layout

Conflicts:
	app/views/groups/_title.html.haml