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

# Conflicts:
#	Capfile
#	Gemfile.lock
#	db/schema.rb

test/factories/error_template_attributes.rb

@@ -1,6 +1,5 @@
 FactoryBot.define do
   factory :error_template_attribute do
-    error_template nil
     key "MyString"
     regex "MyString"
   end