Merge branch 'master' into refactor_proforma_import_export

# Conflicts:
#	spec/controllers/exercises_controller_spec.rb

spec/support/factory_bot.rb

@@ -4,3 +4,7 @@ require 'factory_bot'
 
 # Use "old" FactoryBot default to allow auto-creating associations for #build
 FactoryBot.use_parent_strategy = false
+
+RSpec.configure do |config|
+  config.include FactoryBot::Syntax::Methods
+end