new catalogue
model
Merge branch 'groups'

Conflicts:
	app/models/group.rb