A few bug fixes
Merge branch 'dev2-GUI' of https://github.com/magwitch324/wpi-suite into dev2-GUI
Fixed bug with MyCalendar and TeamCalendar