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
Closes the tab only if the user chaged the content

Reported-by: bnurbekov
Signed-off-by:Batyrlan Nurbekov <bnurbekov@wpi.edu>
Fix the bug that makes the program freeze when the user click the “All game" in the tree with no game in it.

Reported-by: hlong290494
Signed-off by: Long Nguyen Duc Hoang <lhnguyenduc@wpi.edu>
Add a preferences button in the toolbar

This button will be used to open the user preferneces to update information and prefered contact information.
Remove duplicate isViewHasBeenEdited() in CreateGameView.java introduced by @bnurbekov
Add functionality to Preferences button

The preferences button now opens a new tab for where the user can enter in his/her information, this window is not currently making any changes.
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/view/ClosableTabComponent.java
Replaces question marks with "N/A"'s insside of the ClosedGameView

Reported-by: bnurbekov
Signed-off-by: Batyrlan Nurbekov <bnurbekov@wpi.edu>
Merge pull request #327 from bnurbekov/sbl-dev

Replaces question marks with "N/A"'s inside of ClosedGameView
Merge pull request #329 from bbiletch/fix-duplicate-isviewhasbeenedited

Remove duplicate isViewHasBeenEdited() in CreateGameView.java introduced by @bnurbekov
Merge pull request #328 from hlong290494/guiTableVote

Change the JList user votes of the ClosedGameView into Table.
Add basic checking to preferences panel

The preferences panel now checks to make sure that at least one point of communication is entered and selected for being sent to.
Add more comprehensive checks to update user

There are now more comprehensive live checks intergrated into the preference panel to make sure that the proper information is entered.
Change layout slightly to make it look better

AIM check box now lined up properly
Add further checks and error messages

I've added a few more error messages and checks to make sure that the user must have at least one method of communication entered and that that method matched the proper checkbox. The actual updating of a user is not implemented yet.
Add check for phone number

This check now included phone numbers in the format xxx-xxx-xxxx
Merge pull request #324 from hlong290494/freezeGameBug

Freeze gameTree when the database is empty.