Added A Color chooser for categories
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/controller/category/DeleteCategoryController.java
Modified Categories tab
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
Moved the Category tab into CalendarTab
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
Oh pretty color chooser\!
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev

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