Merge OSEM updates

app/views/conference_registrations/_event.html.haml

@@ -7,6 +7,11 @@
         = event.title
         %small
           = event.subtitle
+        .text-muted
+          = registered_text(event)
+          - if event.scheduled?
+            (Scheduled on: #{event.time.to_date})
+
   .panel-body
     -# %p
     -#   = canceled_replacement_event_label(event, event_schedule)

app/views/conference_registrations/show.html.haml

@@ -9,9 +9,9 @@
           -if @conference.venue
             at
             %strong
-              = "#{@conference.venue.name},"
-            = "#{@conference.venue.street},"
-            = "#{@conference.venue.city} / #{@conference.venue.country_name}."
+              = "#{@conference.venue_name},"
+            = "#{@conference.venue_street},"
+            = "#{@conference.city} / #{@conference.country_name}."
           %small
             = date_string(@conference.start_date, @conference.end_date)
   - unless @conference.code_of_conduct.blank?