Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
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 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 remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Added missing tests to Deck
Fixed test for serialization of an array of test, and tested the untested branch of removeCard, if the cards list is 0.

Committed by: Alec Thompson - ajthompson
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Fixes spacing and sizing issues in closedGameView
swconley, friscis
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Merge pull request #244 from ajthompson/sbl-dev

Added missing tests to DeckTest
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