Removing categories from the list of inactive categories is done. Have to add them now the list active categories in the filter
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/maintab/secondarytabs/FilterTab.java