small asthectic changes
Merge branch 'dev' of github.com:Team-Combat-Wombat/wpi-suite-tcw into dev
Merge branch 'dev' of github.com:Team-Combat-Wombat/wpi-suite-tcw into dev
Merge branch 'dev' of github.com:Team-Combat-Wombat/wpi-suite-tcw into dev
Merge branch 'dev' of github.com:Team-Combat-Wombat/wpi-suite-tcw into dev
Merge branch 'dev' of github.com:Team-Combat-Wombat/wpi-suite-tcw into dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/view/overviews/SessionInProgressPanel.java
Merge branch 'dev' of github.com:Team-Combat-Wombat/wpi-suite-tcw into dev
Merge branch 'dev' of github.com:Team-Combat-Wombat/wpi-suite-tcw into dev