Set up for commitments on day
Merge branch 'dev2-merged' of https://github.com/magwitch324/wpi-suite into dev2-merged

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

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