Merge branch 'master' into admin-ticketing

* master: (61 commits)
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
  Re-order Conference Associations
  Cleanup CSS add Snap! style block attachments
  hide venue link if there is no venue link
  No dropshadow
  Text with drop shadow for now
  Tidy up the look of lodging panels
  Show reg status for tickets.
  Tweak CSS, fix loding order
  Move the venue description to below the map.
  Update lodging styling. Add description for venu when map is shown.
  CSS tweaks...
  Make the edit form not so wide.
  Support markdown in more fields
  Cleanup CSS ordering, fix coloring for navdropdowns
  dumb...fix order of link_to args
  ARRRGHHH, another typo...same line...
  fix typo
  ...

db/migrate/20181229233811_remove_arrival_departure_from_registrations.rb

@@ -0,0 +1,6 @@
+class RemoveArrivalDepartureFromRegistrations < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :registrations, :arrival, :datetime
+    remove_column :registrations, :departure, :datetime
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181113195810) do
+ActiveRecord::Schema.define(version: 20181229233811) do
 
   create_table "answers", force: :cascade do |t|
     t.string "title"
@@ -364,8 +364,6 @@ ActiveRecord::Schema.define(version: 20181113195810) do
 
   create_table "registrations", force: :cascade do |t|
     t.integer "conference_id"
-    t.datetime "arrival"
-    t.datetime "departure"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text "other_special_needs"