Merge branch 'master' of github.com:snap-cloud/snapcon

* 'master' of github.com:snap-cloud/snapcon:
  Fix registrations csv
  Tweak Materials to allow anything
  A bit of a hack to accept any webpage...
  Add the ability for Rooms to have a URL.
  Add import rake task
  config that works without docker
  Add some links to navbar
  More login info
  Custom login help info
  Run migration; add apple pay verification
  fix tickets bug with no description

app/views/schedules/_event.html.haml

@@ -17,6 +17,9 @@
     %h4
       - if(event.speakers.any?)
         presented by #{event.speaker_names}
+    - if event.room&.url && @conference.user_registered?(current_user)
+      %p
+        = link_to('Join Event', event.room.url, target: '_blank')
     %p
       = markdown(truncate(event.abstract, length: 400))
       = link_to 'more', conference_program_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400

app/views/schedules/show.html.haml

@@ -1,5 +1,5 @@
 .container
-  = render partial: 'schedule_tabs',  locals: { active: 'schedule' }
+  = render partial: 'schedule_tabs', locals: { active: 'schedule' }
 
   #schedule-content
     %h1.text-center