Updated TODOs
Merge branch 'master' of git://github.com/chris91/ExamScheduler
Merge branch 'master' of https://github.com/ElPenguino/ExamScheduler