Minor fix
Fixing a few bugs on timetables
Merge branch 'master' of github.com:TracyWebTech/xavier