Updates EmailController and UserPrefsController. Adds UserUpdateController.

Cleans up EmailController and tries to fix a bug in UserPrefsController where users are not updated properly.

Author: 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
Merge branch 'team9dev' into feature-emailnotification
Fixes typos in comments for UserPrefsController

Author: nfbrown
Should make database retrieval work for users
Merge pull request #57 from dbeckwith/status-for-gameReqModel

Status for game req model
Adds a custom JSON parser

The Gson parser doesn't get the notification fields from the JSON string
from the server. That's the only reason this class exists.
Fixes bug in UserDeserializer and EmailController

Adds some debugging code and fixes some bugs in UserDeserializer and EmailController

Authors: nfbrown, Sam Carlberg
Merge branch 'feature-emailnotification' of https://github.com/dbeckwith/wpi-suite into feature-emailnotification
Merge branch 'team9dev' into feature-emailnotification

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/controller/UserPrefsController.java
UserPrefsController now singleton
Modifies UserRequestObserver to use UserDeserializer.

This change allows for proper loading of user preferences.

Authors: nfbrown, Sam Carlberg
Fancy playing cards
Fancy cards
conflicts apparently
disable highlight on disabled cards

renamed absusercontroller
add some comments to ImageLoader
fix bad rename
Fixes grabbing users from database

Users can now be received properly from the database. Also cleans up some files.

Authors: nfbrown, Sam Carlberg
Merge branch 'team9dev' into feature-emailnotification

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/planningpoker/controller/EmailController.java
Merge pull request #58 from dbeckwith/feature-emailnotification

Feature emailnotification