Merge branch 'bug/layout' into fix-group-tree

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