Merge branch 'prod-patch'

* prod-patch:
  Load superevents on update/create routes when something errors

app/controllers/proposals_controller.rb

@@ -41,6 +41,7 @@ def edit
 
   def create
     @url = conference_program_proposals_path(@conference.short_title)
+    @superevents = @program.events.where(superevent: true)
 
     # We allow proposal submission and sign up on same page.
     # If user is not signed in then first create new user and then sign them in
@@ -80,6 +81,7 @@ def create
 
   def update
     @url = conference_program_proposal_path(@conference.short_title, params[:id])
+    @superevents = @program.events.where(superevent: true)
 
     track = Track.find_by(id: params[:event][:track_id])
     if track && !track.cfp_active