# Conflicts:
#	app/controllers/admin/course_editions/group_imports_controller.rb
#	app/models/user.rb
#	db/schema.rb