using map
unlistening
Merge all the merges! HAAAANDS!
Fixing next pointer
Refactor s/Model/Client/
Making it easier to add stuff quickly
Pull poll out
Adding jvavadocs
Moved relevant tests from entity manager classes to new client classes.
Fixing some test setups
Fixing several tests
Merge remote-tracking branch 'origin/dev' into caching

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/models/Commitment.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/models/CommitmentEntityManager.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/tabs/AddCommitmentDisplay.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/tabs/DisplayableEditorView.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/day/DayCalendar.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/day/collisiondetection/DayItem.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/month/MonthItem.java
	Calendar/test/edu/wpi/cs/wpisuitetng/modules/cal/models/CommitmentEntityManagerTest.java
More JavaDoc
Fixing UTC tests
Adding some first bits of testing for the pollpusher (broken)
Fixing PollPusher more, still broken tests
Fix da tests!
Not sure what this requirement was
Merge remote-tracking branch 'origin/dev' into commitment_views

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/models/data/Commitment.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/models/server/CommitmentEntityManager.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/day/DayCalendar.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/day/collisiondetection/DayItem.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/month/MonthItem.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/week/WeekCalendar.java
	Calendar/test/edu/wpi/cs/wpisuitetng/modules/cal/models/CommitmentEntityManagerTest.java
	Calendar/test/edu/wpi/cs/wpisuitetng/modules/cal/models/EventEntityManagerTest.java
Merge remote-tracking branch 'origin/dev' into commitment_views

Conflicts:
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/models/data/Commitment.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/models/server/CommitmentEntityManager.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/day/DayCalendar.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/day/collisiondetection/DayItem.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/month/MonthItem.java
	Calendar/src/edu/wpi/cs/wpisuitetng/modules/cal/ui/views/week/WeekCalendar.java
	Calendar/test/edu/wpi/cs/wpisuitetng/modules/cal/models/CommitmentEntityManagerTest.java
	Calendar/test/edu/wpi/cs/wpisuitetng/modules/cal/models/EventEntityManagerTest.java