print view for teacher
namematch update
timetable conflict update
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
SMS
schedule controller updated (phase 1)
schedule controller updated (phase 1)
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
schedule controller updated (phase 1)
schedule controller updated (phase 1)
schedule controller updated (phase 2)
timetable update
schedule override js
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
dev version 1 (w/o sms & email)
pull
conflict
Revert "conflict"

This reverts commit bacafe0ae78155806d2480de9efd9fe5e7a3152b.
conflict
Bug fix in SchedulerDB, stabilize _Schedule.php and change format of final results