Merge master tidy routes

spec/factories/conferences.rb

@@ -49,6 +49,7 @@ FactoryBot.define do
     ticket_layout { 'portrait' }
     description { Faker::Hipster.paragraph }
     organization
+    color { '#FFFFFF' }
     after(:create) do |conference|
       Role.where(name: 'organizer', resource: conference).first_or_create(description: 'For the organizers of the conference (who shall have full access)')
       Role.where(name: 'cfp', resource: conference).first_or_create(description: 'For the members of the CfP team')

spec/factories/event_types.rb

@@ -10,6 +10,7 @@
 #  length                  :integer          default(30)
 #  maximum_abstract_length :integer          default(500)
 #  minimum_abstract_length :integer          default(0)
+#  submission_instructions :text
 #  title                   :string           not null
 #  created_at              :datetime
 #  updated_at              :datetime
@@ -22,6 +23,8 @@ FactoryBot.define do
     length { 30 }
     minimum_abstract_length { 0 }
     maximum_abstract_length { 500 }
+    description { 'Example Event Description' }
+    submission_instructions { 'Example Event Instructions' }
     color { '#ffffff' }
     program
   end