rebase fixes for commercials path

Gemfile.lock

@@ -538,6 +538,3 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
   whenever
-
-BUNDLED WITH
-   1.10.6

app/views/proposal/_form.html.haml

@@ -22,7 +22,7 @@
                   #resource-placeholder{ style: 'background-color:#d3d3d3; float: left; width: 400px; height: 250px; margin: 5px; border-width: 1px; border-style: solid; border-color: rgba(0,0,0,.2);' }
               .row
                 .col-md-6
-                  = semantic_form_for(@event.commercials.build, url: conference_proposal_commercials_path(conference_id: @conference.short_title, proposal_id: @event)) do |f|
+                  = semantic_form_for(@event.commercials.build, url: conference_program_proposal_commercials_path(conference_id: @conference.short_title, proposal_id: @event)) do |f|
                     = f.input :url, label: 'URL', as: :string, input_html: { required: 'required', type: 'url' },
                     hint: 'Just paste the url of your video/photo provider. Currently supported: YouTube, Vimeo, SpeakerDeck, SlideShare, Instagram, Flickr.'
                     = f.action :submit, as: :button, button_html: { class: 'btn btn-primary pull-right', disabled: true }

app/views/proposal/_tooltip.html.haml

@@ -26,7 +26,7 @@
       - if progress_status['commercials']
         = link_to 'Edit the commercials', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
       - else
-        = link_to 'Add a commercial', edit_conference_program_proposal_path(event.conference.short_title, event, anchor: 'commercials-content')
+        = link_to 'Add a commercial', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
   %li{'class'=>class_for_todo(progress_status['difficulty_level'])}
     %span{'class'=>icon_for_todo(progress_status['difficulty_level'])}
       - if progress_status['difficulty_level']