Began implementing new event display algorithm. Algortihm is unfinished and does nothing. Build still works.
Algorithm is functional. Alignment of events with times is slightly off.
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into feature/ConcurrentEventUpdate

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/calendarview/day/EventView.java
Improved alignment of events with time slots
Aded Comments
Merge branch 'feature/jtc_bug_fixes' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes
Merge remote-tracking branch 'origin/feature/ConcurrentEventUpdate' into feature/jtc_bug_fixes
changed commitment display in DayView to how Martin wants it and set default initial scroll in DayView and WeekView to show a more reasonable time
improved WeekView multiday
Merge branch 'feature/jtc_bug_fixes' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes
changed multiday events to only exist in their list once, as per the new display implementation from John
removed needless print
fixed DayView tooltips for Commitments and removed a looped println that may have contributed to performance problems
Merge branch 'feature/jtc_bug_fixes' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes
Fixed Year to Day view changer
Fixed Merge Conflicts
Merge remote-tracking branch 'origin/dev' into feature/jtc_bug_fixes
Merge branch 'dev' of github.com:CS3733Team1/wpi-suite into feature/quicklist