more work on filter tab
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/models/CalendarData.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/maintab/secondarytabs/FilterTab.java
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev