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
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
Revert "Merge pull request #267 from benkorza/sbl-dev"

This reverts commit 8a878469ddf40d8c9b0fd0fd4e6a37649f0faa94, reversing
changes made to de80670b94ebf9bae0c227637539eb1c0ac0d3bd.
Removes unneeded text files.
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