Merge pull request #74 from mehere/dev

Pull Request from dev -> dev-wee on 2/3
Merge pull request #75 from mehere/dev

resolve conflict
Merge pull request #76 from mehere/dev

schedule folder under relief
AED timetable updated
Inserted placeholder functions for SchedulerDB
Inserted placeholder functions for SchedulerDB
Merge pull request #77 from mehere/dev-wee

Inserted placeholder functions for SchedulerDB
Merge branch 'dev-YangWei' of https://github.com/mehere/RTSS.git into dev-YangWei
AED timetable updated
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev-YangWei