make iteration field changes from instructions on my.wpi
Andrew Busch
Merge branch 'team_master' into dev

* team_master:
  make iteration field changes from instructions on my.wpi Andrew Busch

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/game/models/Game.java