Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite 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.
Add UserModel, User, AddUserRequestObserver, and AddUserController

Other bits of the user still need to be implemented
Adds a working export button to the Requirements Manager.  The button still needs some aesthetic polishing
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