Merge branch 'sbl-dev' of 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
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 sbl-dev
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
adds comments to code and removes commented out code that is unnecessary from CreateGameView
Merge pull request #196 from sfmailand/austin-with-buttons

Add start and end game button
Merge pull request #197 from labatbouta/sbl-dev

adds comments to CreateGameView and removes commented out code that is not necessary
Merge pull request #198 from friscis/sbl-dev

Implements the hasEndDate check on Planning Poker and comments out error...
Starts creating the closed game view based off of the open game view
labatbouta, friscis
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev