# Conflicts:
#   app/models/course_edition.rb
#   app/models/project.rb
#   db/schema.rb