Merged Mythic's changes.

app/views/proposals/show.html.haml

@@ -73,7 +73,7 @@
         %dl#proposal-info
           .col-md-12
             %dt Date:
-            %dd= @event_schedule.start_time.strftime("%Y %B %e - %H:%M") if @event_schedule
+            %dd= @event_schedule.start_time.strftime("%Y %B %e - %-I:%M %p") if @event_schedule
           .col-md-12
             %dt Duration:
             %dd= show_time(@event.event_type.length)
@@ -95,7 +95,7 @@
                 %span.label{style: "background-color: #{@event.track.color}; color: #{ contrast_color(@event.track.color) }"}
                   = @event.track.name
           .col-md-12
-            %dt Difficulty:
+            %dt Audience:
             %dd
               - if @event.difficulty_level
                 %span.label{style: "background-color: #{@event.difficulty_level.color}; color: #{ contrast_color(@event.difficulty_level.color) };"}
@@ -118,7 +118,7 @@
                   %dl
                     %dt Start Time:
                     %dd
-                      = event.program.selected_event_schedules.find { |es| es.event == event }.start_time.strftime("%Y %B %e %H:%M")
+                      = event.program.selected_event_schedules.find { |es| es.event == event }.start_time.strftime("%Y %B %e %-I:%M %p")
                     %br
                       %dt Room:
                       %dd