Placed filter combo box back into dev and abstracted the show data check boxes a bit.
Commented non-functional category code.
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev
# By Andrew Roskuski (5) and others
# Via Tim (5) and others
* 'dev' of https://github.com/magwitch324/wpi-suite:
  Add tests for RepeatngEventList
  Added the “Edit” and “New” icons for the buttons that will be placed in the Manage Categories and Filters tabs
  Added functions (for now commented) to add a manage filters tab with its corresponding icon, as well as for closing this tab
  Added basic UI to CategoryTab
  Forgot to add file
  Added class to attempt to rewrite CommtimentTab
  Fixed #87.
  Partially implemented remove Category function
  local variables should be final
  added copyright
  local variables should be final
  implemented addCategory in CalendarData
  added testing for repeatingevent class
  Removed category place holders
  Commented out some code which needs to be rewritten and did more implementation on categoryList
  Saves the team/personal/both selection in all comm view
  Fixed Build and started to implement CategoryList
  added manage categories button and categories tab
  Added new fields to the Category Class

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/MyCalendar.java