Adds tests for GameRequirementModel, ViewController. ViewController not finished
Finishes tests for ViewController
Merge branch 'team9dev' into time2test
Adds tests for GetGamesController, UpdateGamesController
Merge latest team9dev into time2test
Code formatting and cleanup
Changing requirement area to wrap text

Changing requirement description in vote panel so it wraps the text

Author: lhunker
Tests PlanningPoker, adds tests to Estimate JSON methods, adds tests to GameModel Estimate manipulation methods.
Merge branch 'team9dev' into time2test
Code formatting and cleanup
Merge pull request #53 from dbeckwith/time2test

Time2test
Adds icon for user preferences

Author: ammesonb
Merge pull request #54 from dbeckwith/preferences-icon

Adds icon for user preferences
Adds functionality to valid email

Refactors validating email to a helper method. Checks for valid email
format in update method in UserManager.

Author: Shockolate tcarmstrong
Adds a controller for getting the current user

Also adds and updates some documentation
findUser is now public
BugFix for updating user email

Actually updates the user email when updating a user.

Author: Shockolate Ellychou nfbrown
Merge branch 'team9dev' into feature-emailnotification

Conflicts:
	Core/WPISuite/src/edu/wpi/cs/wpisuitetng/modules/core/entitymanagers/UserManager.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/controller/EmailController.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/controller/UserPrefsController.java