week view overlap.
fixed merge issues
fixed
fixed merge
Gave EventView 15-minute resolution
Added isTeam field to Commitments and Events, and team filtering to their models. PULLING THIS COMMIT REQUIRES A DATABASE RESET
Increased granularity of event display in WeekView to match DayView
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes
commitments show on dayview
Merge branch 'feature/jtc_bug_fixes' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes
fixed merge conflicts
updated Month View
Merge branch 'feature/jtc_bug_fixes' of https://github.com/CS3733Team1/wpi-suite into feature/jtc_bug_fixes
Merge branch 'feature/jtc_bug_fixes' of https://github.com/CS3733Team1/wpi-suite into dev

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/calendarview/day/DayView.java
	DefectTracker/.settings/org.eclipse.jdt.core.prefs
	Janeway/.settings/org.eclipse.jdt.core.prefs
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev