Fix Jenkins build for Lisa's tests
Tests DeckEntityManager
Fix Jenkins build (this time for sure!)
Merge pull request #377 from labatbouta/sbl-dev

Tests DeckEntityManager
Merge pull request #379 from bbiletch/sbl-dev

Fix Jenkins build for Lisa's tests
Checked out by Ben
bnkorza
Fixes javadoc conventions
Merge pull request #380 from benkorza/sbl-dev

Fixes javadoc conventions
Merge pull request #381 from bbiletch/sbl-dev

Fix Jenkins build (this time for sure!)
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into voteStatusIcon

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controller/GetPlanningPokerVoteController.java