Add UserEntityManager
Change GetUserControllerTest to fit the method calls that are now used within the user class
Update UserModel to use a string for the id instead of an int, as the ID is the userName
Change to import Planning Poker User class instead of the core User
Change to import PlanningPoker User class instead of the core user
Change to import PlanningPoker user class instead of core user
Change import to using PlanningPoker user class instead of core user
Attempt to save user from contact pane
Change path from planningpoker game to user

This error was left over from copy/paste
Change import from core user to PlanningPoker user
Add fromJSONArray method
Remove unused User declaration
Add PlanningPoker user to manager layer
Change how EntityManager checks to save a user
adds functions to PlayingCardJPanel class to make code cleaner
worked with cgwalker
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' into add-users
Add to JSONArray method for the user

Contributor: bbiletch, sfmailand
fixes remove and add buttons in NewGameView
worked with cgwalker
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into add-users

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/ContactInformationPromptView.java