Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

# Conflicts:
#	db/schema.rb

test/factories/error_template_attributes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :error_template_attribute do
     error_template nil
     key "MyString"

test/factories/error_templates.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :error_template do
     execution_environment nil
     name "MyString"

test/factories/structured_error_attributes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :structured_error_attribute do
     structured_error nil
     error_template_attribute nil

test/factories/structured_errors.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :structured_error do
     error_template nil
     file nil