Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controller/AddDeckController.java
makes fix to break I made in AddDeckController
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controller/AddDeckController.java
Merge pull request #310 from labatbouta/sbl-dev

makes fix to my broken code in AddDeckController