Fleshed out the Category class by adding a secondary constructor which adds the following params:
* creatorID: the ID of the user who created this event
* isDeleted: states whether the category has been deleted or not
* isTeamCat: states whether the category shows up on the team or personal calendar
Merge branch 'dev' of http://github.com/tomorrow-nf/wpi-suite-team5 into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/models/category/Category.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/models/entry/Event.java