Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
 add AddIcon to CreateDeck Tab
worked with mamora and bbiletch
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Change OpenGameView GUI
Get cards to appear

Finally got the cards for voting to appear in the proper place

No card voting is still not implemented
Change author of file to myself

View of all users who have voted still not working
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into new-openGameView

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
Remove annoying border headers that cluttered everthing up
Auto formatting
Merge pull request #414 from sfmailand/new-openGameView

New open game view
Resize the left columns of MainView, OpenGameView and ClosedGameView

Reported-by: hlong290494
SIgned-off by: Long Nguyen Duc Hoang <lhnguyenduc@wpi.edu>
Replace the blank icon & fix remove set enabled in Create Deck View when the list is empty.

Reported-by: hlong290494
Signed-off by: Long Nguyen Duc Hoang <lhnguyenduc@wpi.edu>
Merge pull request #411 from labatbouta/sbl-dev

Adds addIcon to Create Deck Tab
Change error text to a space instead of nothing

This makes it so that the label always has text in it, as when it doesn't have anything in it it was changing how the GUI looked slightly. It still looks the same, as the error message is not a ' ' instead of nothing
Merge pull request #415 from hlong290494/sbl-dev

Minor fixes
Merge pull request #416 from sfmailand/sbl-dev

Change error text to a space instead of nothing