Update to SchedulingEngine to resolve conflict on git
Conflicts resolved
Merge branch 'wviljoendev' of https://github.com/thedarkjester/CPD7045 into wviljoendev
Added implementation for all events needed by Schedular
Merge branch 'wviljoendev' into develop