Add mock network harness constructor to GetUserControllerTest.

CoAuthors: Ryan, cgwalker
Fix merge conflicts with mock network stuff

CoAuthors: cgwalker, rbkillea

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controller/GetPlanningPokerFinalEstimateController.java
Fixed tests failing due to modified JSON representation.

CoAuthors: rbkillea, cgwalker
Fix merge conflicts.
CoAuthors: cgwalker, rbkillea
Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controller/GetPlanningPokerFinalEstimateController.java
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Changed the color of the planning poker card selection border to be more visible on projectors.

CoAuthors: cgwalker, rbkillea
Removed borders

Removed borders in closed, create, new, and open game view to make them look better
Merge pull request #336 from cgwalker/sbl-dev

Changed color of PlanningPoker card selection and removed mocknetwork
Update layout of contact preferences

Change warning to be red, add a description for what things mean
Auto Format Preferences window
Fixed references to email user constructor
My file search missed a few references to the User constructor, and eclipse decided not to complain about the errors yesterday, so I didn't notice. This should fix the build.

Signed-off-by: ajthompson
Merge pull request #343 from ajthompson/defect-tracker-hotfix

Fixed references to email user constructor
Merge pull request #339 from ZPak/sbl-dev

Removed borders
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge pull request #342 from sfmailand/update-preferences

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