Fixed and re-added JUnit tests previously removed by Philipp Baumann
Merge branch 'JUnitTests' into dev

* JUnitTests:
  Fixed and re-added JUnit tests previously removed by Philipp Baumann

Conflicts:
	PlanningPoker/test/edu/wpi/cs/wpisuitetng/modules/planningpoker/models/GameManagerTest.java