Merge main-calendar into templates
Force users to go to edit screen to delete recurring events in admin
Merge remote-tracking branch 'origin/main-calendar' into templates
Added default number of days for main calendar
merge from templates