Revert "Merge remote-tracking branch 'origin/team9dev' into endGamev2"

This reverts commit bab478d2af079a7c0e28d9365b94f598b76f4eb8, reversing
changes made to e61aa2a66494b53cccf702d4aaabd90ccf1f06a3.

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/model/GameModel.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/model/GameRequirementModel.java