Merge branch 'sbl-dev' of github.com:bnurbekov/wpi-suite into bnurbekov-sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Hotfix for the estimate box

Fix for clearing the manual estimate box when switching to the different
requirement

Reported-by: bnurbekov, bkorza
Signed-off-by: Batyrlan Nurbekov <bnurbekov@wpi.edu>
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Fix some bugs in the open game view, and update the UI based on votes in the database.
Beam me up to date Scotty
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
Merge pull request #243 from austintrose/sbl-dev

Fix some bugs in the open game view, and update the UI based on votes in the database.
Merge branch 'sbl-dev' of github.com:friscis/wpi-suite into sbl-dev
Merge pull request #245 from friscis/sbl-dev

Fixes spacing and sizing issues in closedGameView
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Game changes from new to open when you click the "Start Voting" button
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Move end date checking to server.  Fixes crashing bug.
Merge pull request #246 from bbiletch/sbl-dev

Move end date checking to server.  Fixes crashing bug.
Checked out by Ben Korza
benkorza
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:bnurbekov/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
Merge branch 'bnurbekov-sbl-dev' into sbl-dev
Fix issue with Batyr's change so that games with decks still open

Batyr's change worked very well for games with no decks, but caused an issue if the game did have a deck. I wrapped his change in an if statement so it only runs if the game has no deck.
Merge pull request #249 from sfmailand/sbl-dev

Fix issue with Batyr's change so that games with decks still open