time display; algo input update
time display; algo input update
time display; algo input update
time display; algo input update
time display; algo input update
Merge pull request #26 from mehere/dev

Pull Request from dev -> dev-wee on 15/2
Remove  a bug in _upload.php
Resolved conflicts
Resolving conflicts
Resolving conflicts
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
Merge pull request #27 from mehere/dev-wee

Updates on scheduling algo
Fixed _upload.php
Merge pull request #34 from mehere/dev-wee

Fixed _upload.php
insert time table; set/get exlcuded list
Merge dev_xue into dev
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei
ui updated