cleans up TODO comments
Doruk Uzunoglu, Jordan Wetzel
Merge branch 'origin/dev'

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/pprequirement/models/PPRequirement.java
Revert "Fixed sizing for the help panel and make one of the descriptions mroe informative. Justin Canas"

This reverts commit 7e0254d2f83ee4cc761a1b40d247c33e3211ffe9.
Fixes previous Merge conflict
Re-adds changes from 7e0254d2f83ee4cc761a1b40d247c33e3211ffe9 that were accidentally removed
Merge branch 'dev' into team_master

* dev:
  Re-adds changes from 7e0254d2f83ee4cc761a1b40d247c33e3211ffe9 that were accidentally removed
  Fixes previous Merge conflict
  Revert "Fixed sizing for the help panel and make one of the descriptions mroe informative. Justin Canas"
  cleans up TODO comments Doruk Uzunoglu, Jordan Wetzel