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 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
 makes network private and creates setter for network testing
worked with rbkillea
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:labatbouta/wpi-suite into labatbouta-sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controller/AddDeckController.java