Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/SeeOpenGameView.java
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/SeeOpenGameView.java
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
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
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
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
comments code with labatbouta
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
cleans up format of code with labatbouta
Merge pull request #230 from mamora203/sbl-dev

cleans up format of code with labatbouta
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
Fix retrieving votes from database
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev

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