Merge pull request #183 from ajthompson/dev-deck-de-serializer

Added Deck Serializer and Deserializer, plus a Serialization Test
Merge branch 'sbl-dev' of git://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
Progress made in manual submission
friscis, mamora
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Adds the switching from manual and card vote submissions
mamora, friscis, sfmailand, bnkorza
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:mamora203/wpi-suite into mamora203-sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/SeeOpenGameView.java