Conflicts:
	VERSION
	app/controllers/groups_controller.rb
	app/models/group.rb
	db/schema.rb
	doc/api/groups.md
	lib/api/entities.rb
	lib/api/groups.rb