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

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/SeeOpenGameView.java
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

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 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
Changes made up till pull request from main repo
Merge https://github.com/struct-by-lightning/wpi-suite
Merge https://github.com/struct-by-lightning/wpi-suite
All the changes I was able to make regarding retriving votes. Authors: rbkillea
Resize the card image and fix the size of the card

Reported-by: hlong290494
Signed-off by: Long Nguyen Duc Hoang <lhnguyenduc@wpi.edu>
Removed the debug function in adjusting card image size.
Merge pull request #220 from hlong290494/cardBtnSize

Fix card image and pixelated image
Fix some of the issues that were occuring when an audit was run using the WPISuite preferences
Merge pull request #221 from sfmailand/fix-audit-problems

Fix some of the issues that were occuring when an audit was run using WPISuite preferences
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev