Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Adds Database code for final estimates so the user is able to submit them all at once, not implemented yet
friscis, swconley, mamora
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Allows final estimates to be submitted to the database instead of to the requirement manager
friscis, swconley, mamora
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
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
adds preliminary test to AddDeckController
Merge pull request #274 from labatbouta/sbl-dev

adds preliminary test to AddDeckController