fixed #31
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev

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