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
Adds the functionality of no card deck to the OpenGameView

Adds the functionality of no card deck to the OpenGameView if the user
selected "no card deck" as the preferred card deck for the game. The
functionality is not fully implemented yet.

Reported-by: bnurbekov, bkorza
Signed-off-byL Batyrlan Nurbekov <bnurbekov@wpi.edu>
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Adds the functionality of the manual estimate submission

Reported-by: bnurbekov, bkorza
Signed-off-by: Batyrlan Nurbekov <bnurbekov@wpi.edu>
Added Deck protection from null
Decks can now no longer be created with a null value for the name.  The card list will also remain null until cards are added.

The serializer now only adds a card field if the cards field is not null, and the deserializer sets cards to null if there is no card field.

Committed by: Alec Thompson - ajthompson
Merge branch 'sbl-dev' into exp-deck
Merge pull request #225 from ajthompson/exp-deck

Added null value protections in Deck and it's serializers
Fixed bugs in deck and serializer
Switched one of the constructors for Deck to use null instead of a new empty arraylist, and added tests for null decks and the serializer.

Committed by: Alec Thompson - ajthompson
Added a few more comments.
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge pull request #228 from cgwalker/sbl-dev

Added a few more comments.
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge pull request #227 from ajthompson/exp-deck

Fixed bugs in deck and serializer
Merge branch 'sbl-dev' of github.com:mamora203/wpi-suite into mamora203-sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/models/DeckSerializer.java
Merge pull request #230 from mamora203/sbl-dev

cleans up format of code with labatbouta
Show previous votes in OpenGameView
Merge branch 'sbl-dev' of github.com:bbiletch/wpi-suite into bbiletch-sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
Gets the basic formatting of closed game view, does not have actual votes yet
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev