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 pull request #196 from sfmailand/austin-with-buttons

Add start and end game button