DayCalendar  Event Overlap
Merge remote-tracking branch 'origin/dev' into feature/jtc_bug_fixes
fixed changes
fixed category retrieval from server (projects don't have projects) and did some stuff to toStrings
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes
Fixed category display, made add, delete, remove filter work [there is an error on delete still
Merge branch 'feature/Filters' of https://github.com/CS3733Team1/wpi-suite into feature/Filters
Merge branches 'dev' and 'dev' of https://github.com/CS3733Team1/wpi-suite into feature/Filters