design groups
Merge branch 'groups' of https://github.com/khcr/neurones into groups

Conflicts:
	app/views/admin/groups/activation.html.erb