month view controller
something
MonthViewPanel clickable
week & day view button
Fixed Conflicts
Really Fixed Conflicts
Commitment linked to month view
Merge branch 'GUI' of https://github.com/Tommzy/wpi-suite into GUI

Conflicts:

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/controller/MainCale
ndarController.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewGridPanel.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewPanel.java
clean up
Revert "Really Fixed Conflicts"

Conflicts:

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/controller/MainCale
ndarController.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewGridPanel.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewPanel.java
clean up
manually merge
finally get Derek's Buttons
Merge branch 'GUI' of https://github.com/Tommzy/wpi-suite into GUI

Conflicts:

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/controller/MainCale
ndarController.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/controller/monthvie
w/MonthViewController.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/model/Commitment.ja
va

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/util/DateController
.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/AddEventTabPan
el.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/CalendarWeekVi
ew.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/MainView.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewGridPanel.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewPanel.java
	Core/WPISuite/WebContent/WEB-INF/lib/DefectTracker.jar
	Core/WPISuite/WebContent/WEB-INF/lib/WPISuite-Interfaces.jar
	Janeway/modules/DefectTracker.jar
Merge commit '6b53111189fdd6ee101901f09563c1243bb01ebf' into GUI

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/model/Commitment.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/CalendarDay.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/CalendarDayView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/CalendarWeekView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/EventLabel.java
	Core/WPISuite/WebContent/WEB-INF/lib/DefectTracker.jar
	Core/WPISuite/WebContent/WEB-INF/lib/WPISuite-Interfaces.jar
	Janeway/modules/DefectTracker.jar
modified day and week view to resolve conflict
commitment done
minor fix
fixed day view
Fixed border of WeekView