Fixed error in algorithm that led to displaying the same event multiple times
Merge branch 'feature/jtc_bug_fixes' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/calendarview/day2/DayArea.java