Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into feature/DatePicker

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/event/EventTabPanel.java
Merge branch 'feature/DatePicker' into dev
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into feature/AddEventDataValidation