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

Conflicts:
	app/views/admin/g/modules/index.html.erb
	lib/tasks/data.rake