fix bug
Merge dev_xue into dev
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)
debug 2
schedule controller updated (phase 2)
timetable update
check conflict
getTeacherName
schedule override js
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
test