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
Add a preferences button in the toolbar

This button will be used to open the user preferneces to update information and prefered contact information.
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.
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 #326 from sfmailand/add-prefButton

Add a preferences button in the toolbar
This works, though it would be nice if it had some visual confirmation that it submitted successfully.
Added more detailed email notifications
Emails now contain the name of the game, the requirements being voted on, and the deadline if the game is being started and has a deadline.

Committed by: ajthompson
Change Preference pane to fit the usermodel and make it look a bit better
Merge pull request #331 from ajthompson/sbl-dev

Added more detailed email notifications
Merge pull request #332 from sfmailand/add-prefButton

Change Preference pane to fit the userModel and make it look a bit better
Change PlanningPokerUser to fit notification scheme better

The user now has two boolean values for whether email or AIM will be sent
Also removed sms field, as we aren't currently working on that ability
Add auto-population

The preferences tab now updates with all of the user's settings

The initial window now stores both email and AIM and sets the user's settings to automatically send to any of them that are filled in
Remove checkAllFields call at initialization

This isn't needed, as in order to log in the first time or get to this window, valid settings must already be entered
Update user preferences

The preferences tab now allows the user to update his/her email and AIM settins