Timetable system update.
updated time tabel report
Merge remote-tracking branch 'origin/master'
updated substitute teacher
Merge remote-tracking branch 'origin/master'

Conflicts:
	common.js
updated substitute teacher