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
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 git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Add image background to the cards

Reported-by: hlong290494
Signed-off by: Long Nguyen Duc <lhnguyenduc@wpi.edu>
Merge branch 'cardBg' of github.com:hlong290494/wpi-suite into sbl-dev
Merge pull request #213 from hlong290494/cardBg

Add image background to the cards
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge pull request #212 from labatbouta/sbl-dev

makes addToGame tab and removeFromGame tab disabled until user selects requirement to add or remove
Merge branch 'sbl-dev' of 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
updates the actual requirement and updates respective guis
Merge pull request #214 from friscis/sbl-dev

updates the actual requirement and updates respective guis
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
Fix deck error when casting to String.

When creating a game, the deck was being cast to a string, this was not the proper way to do it, instead it should have been using the toString() method to get the string of the deck. This has been changed
Add casting back in, as toString caused crashing to occur in some cases
Change card selelction menu back to using string.

Having the card drop down menu as a deck was causing all sorts of weird issues to pop up, I changed it back to just using a string so that we have a working product. We should look into what's causing that other issue.
Remove else that was commented out