added easier placeholders to test
added easier placeholders to test
Merge branch 'generic_calendar' into schedule-editor
Merge remote-tracking branch 'origin/schedule-editor' into schedule-editor
added a more abstract function to list programs