Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Begun adding the DeckModel
This will be an ongoing process, as I still need to add the Add and Get controllers to get this to actually compile.

Committed by: Alec Thompson - ajthompson
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into VoteModel
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Merge branch 'sbl-dev' into deck-model
Added a GetPlanningPokerVote controller and observers

Co-authors:
Long Nguyen Duc Hoang
Christian Walker
Ryan Killea
Finished the DeckModel and added class stubs
I added class stubs for Add, Get, and Update controllers and request observers.  I'll be working on those if I get any time at intercollegiate band, where I may not have internet access.

Committed by: Alec Thompson - ajthompson
Add classes and methods central to retrieving votes from the database for a specific requirement within a project.

Authors: rbkillea, cgwalker, lhnguyenduc
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Merge branch 'sbl-dev' into deck-model
Pieces needed to simulate this view.
Introduces my OpenGameView.java file, and deletes several now-unused files.
Import correction
Additions for the new view for an open game.
Merge branch 'open-game-view' of github.com:austintrose/wpi-suite into austintrose-open-game-view

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controllers/MainViewController.java
Finished more of the networking requirements
I added the Add controller and observer, along with the get controller.

Committed by: Alec Thompson - ajthompson from Gordon College's guest wifi
Added the RequestObserver for Decks
Also fixed a small bug in the constructor of the AddDeckController, I had forgotten the this as a parameter for creating a new AddRequestObserver

Committed by: Alec Thompson - ajthompson
Merge branch 'open-game-view' of github.com:austintrose/wpi-suite into austintrose-open-game-view

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controllers/MainViewController.java
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into austin-with-buttons

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controllers/MainViewController.java
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev