Add NonOverlappingTimePeriodMap
Merge branch 'master' into new-schedules