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
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
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
Merge pull request #218 from sfmailand/change-back-to-string

Change menu back to string
Signed-off-by: Ryan Baylor Killea
All the changes I was able to make regarding retriving votes. Authors: rbkillea
Add WPISuite header files to those missing it
Merge pull request #219 from sfmailand/add-headers

Add WPISuite header files to those missing it
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