* 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
...
The current order leads to an error on the route
GET /conferences/:short_name/physical_tickets
The Rails error message was rather helpful! 😁
```
Completed 500 Internal Server Error in 35ms (ActiveRecord: 12.0ms)
ActiveRecord::HasManyThroughOrderError (Cannot have a has_many :through association 'Conference#physical_tickets' which goes through 'Conference#ticket_purchases' before the through association is defined.):
app/controllers/admin/physical_tickets_controller.rb:11:in `index'
```
* misc-release-tweaks: (38 commits)
Improve markdown support and tweak sponsorship langage
Use Ruby 2.5.5 since that is in the docker dev container
Do not need to specify callback url
attempt to fix the discourse callback URL
use a div with padding.
Help button is weird.
Dropdown menu style tweaks
fix logic for snap sso link
tweak form display in dropdown
Tweak devise modules list
Work on omniauth setup
Minor HTML cleanup
More CSS-y things
BJC-ify a bunch of styles
More wording tweaks
Tweak some wording, html and descriptions for Snap!Con
Enable a bunch more markdown options.
Delete some unnecessary files
attempt one more fix
readd back the group by
...
Redirecting users to `/account/sign_in` caused a redirect loop which crashed the page, but still adds them to the `users` table correctly.. Forcing users to the `root_path` solves the redirect loop.
