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
Delete UserModelTest since we're changing the way the user is handled
Delete all user related files in planning poker
Delete more user files
Add all of the classes for the new user model (currently empty) that we will be using from now forward.
Changes to requirement manager to support export button - still in progress
Allows final estimates to be submitted to the database instead of to the requirement manager
friscis, swconley, mamora
Add UserModel, User, AddUserRequestObserver, and AddUserController

Other bits of the user still need to be implemented
Merge pull request #266 from sfmailand/sbl-dev

Add user model
Revert "Merge pull request #261 from sfmailand/userModel"

This reverts commit 0eb2203b373da1964f65315a0a4c3fb9147a8adf, reversing
changes made to 0a568352521e5f076a793880ca8879446b5e780e.

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/models/UserEntityManager.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/models/UserModel.java
Revert "Merge pull request #267 from benkorza/sbl-dev"

This reverts commit 8a878469ddf40d8c9b0fd0fd4e6a37649f0faa94, reversing
changes made to de80670b94ebf9bae0c227637539eb1c0ac0d3bd.
Merge pull request #267 from benkorza/sbl-dev

Adds a working export button to the requirement manager.
Merge pull request #268 from ryanbaylorkillea/tempmaster

Tempmaster
Preliminary tests for the GetPlanningPokerGamesController class.

CoAuthors: cgwalker, rbkillea
Fix merge conflicts introduced by Ben and Batyr

CoAuthors: cgwalker, rbkillea

Conflicts:
	PlanningPoker/test/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/controller/GetUserControllerTest.java
Merge pull request #269 from cgwalker/sbl-dev

Preliminary tests for the GetPlanningPokerGamesController class.
Delete a merge conflict artifact and clean up some comments.
-- Austin Rose (atrose)