CC-5220
Cancelled show still appears on Dashboard
CC-5221
Don't refresh Calendar after closing add/remove popup
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x