Merge branch 'master' into indentation_fix

db/migrate/20170705075039_add_state_cfp_active_and_submitter_reference_to_tracks.rb

@@ -0,0 +1,8 @@
+class AddStateCfpActiveAndSubmitterReferenceToTracks < ActiveRecord::Migration
+  def change
+    add_column :tracks, :state, :string
+    add_column :tracks, :cfp_active, :boolean
+    add_column :tracks, :submitter_id, :integer
+    add_index :tracks, :submitter_id
+  end
+end