Timetable filter more dynamic
Merge branch 'master' of https://github.com/TashPotatoes/STIMulate