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

Conflicts:
	app/assets/stylesheets/sitewide/admin/css/admin_group.css.css