#660 - auto timeslot generation
Merge branch 'auto-timeslot'
merge