More set up for ScheduledEventMerge
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
fixed package naming issues that broke the build