Fixed incorrect ordering of events. removed low level sort that was temp fix for that
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev