Modified elements of hierarchy
Merge branch 'dev' into sfp

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/AbCalendar.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/DayPane.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/GUIEventController.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/MonthView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/WeekPane.java
Fixed painting errors, everthing displays correctly
Merge branch 'dev' into sfp
Saves scroll position, displays commitments on week, expand commitments on
calendar
Removed calData from constructors of DayView, WeekView, MonthView
Display refreshes immediately after CalData update
Merge branch 'dev' into sfp
Merge branch 'dev' into sfp

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/CommitDetailedPane.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/CommitmentView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/DayPane.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/DayView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/DetailedDay.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/GUIEventController.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/MonthView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/WeekPane.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/WeekView.java
Merge branch 'dev' into sfp

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/DayPane.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/GUIEventController.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/MonthView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/WeekPane.java
started work on populating commdata
trying to make commitments work with new calling structure
fixed it! now allows database to actually save info
Merge remote-tracking branch 'origin/dev-abstracting' into dev-sfp-twg
made week work
Fixed day name issues
fixed displaing of events/comms all the time
trying to fix merge conflicts and get it to work
fixed color issues
fixed merge issues