"Show cancelled" not working on timeline view
use clockpunch gem instead of copying in
Merge pull request #40 from tablexi/timeline_missing_cancelled_reservations_71793

"Show cancelled" not working on timeline view #71793
Merge branch 'master' into upgrades
Merge branch 'upgrades' into accessory_scaling
Merge branch 'accessory_scaling' into new_order_edit_page