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 pull request #223 from cgwalker/sbl-dev

Standardize all of the license comments so that they are exactly the same.
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 pull request #224 from cgwalker/sbl-dev

Added more comments to several class files.
Merge branch 'sbl-dev' into exp-deck
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
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
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
comments code with labatbouta
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