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
Removed the email field from core User
And reverted everything that wasn't changed by anything but user compatibility stuff back to the version on the master repository.

Signed-off-by: ajthompson
Changed the color of the planning poker card selection border to be more visible on projectors.

CoAuthors: cgwalker, rbkillea
Merge pull request #335 from ajthompson/sbl-dev

Removed the email field from core User
 Changes text sizes to make text consistent size in ClosedGameView
Merge pull request #338 from labatbouta/sbl-dev

 Changes text sizes to make text consistent size in ClosedGameView
Merge pull request #337 from ZPak/sbl-dev

Commented several files
Merge pull request #336 from cgwalker/sbl-dev

Changed color of PlanningPoker card selection and removed mocknetwork
Made games start with the submit button disabled and the field populated with "?".
Fixed the submit button.
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Send instant message notifications
Send messages, using the format of the email messages, using the Smack XMPP API to send messages over Google Hangout chat.

Signed off by: ajthompson, rbkillea
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