Editing Categories
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev

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