Merge branch 'master' into api-query-tests
Merge branch 'master' into api-query-tests
created overlap tests
Merge branch 'master' into overlap-schedules
Small fix