Finalize Schedule
Merge branch 'new_calendar' into development