Merge branch 'master' into call_for_booths

spec/factories/tracks.rb

@@ -5,5 +5,11 @@ FactoryGirl.define do
     color { Faker::Color.hex_color }
     short_name { SecureRandom.urlsafe_base64(5) }
     program
+
+    trait :self_organized do
+      association :submitter, factory: :user
+      state 'new'
+      cfp_active false
+    end
   end
 end