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
Fix to allow users to actually be retrieved by the controller
Previously, the GetUserController and GetUserRequestObserver classes weren't working, and would only return an empty list of users, leading to an exception when Mailer tried to send an email with no recipients. The problem was that the address for the class planningpoker/user in GetUserController in the retrieveUser method was accidentally wpisuite-interfaces/user because of some confusion about what the address actually represented.
I switched the address to read planningpoker/user to match the address added to the memory layer, and that fixed it. To accompany this change, the required methods to create and send the email to the users on the server was added to NewGameTab, and a method to add emails from a list of users was added to Mailer.

When testing, note that Mailtrap only shows the first email listed as a recipient, though console logs printed upon sending confirm that the email is being sent to all of the emails attached to users on the server.

Committed by: Alec Thompson - ajthompson
Merge branch 'sbl-dev' into issue-76-email
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Made add/remove buttons uniform

Central add/remove buttons are now uniform over any window size/resolution
Merge pull request #145 from hlong290494/sbl-dev

Manually merged Pull request #141 of sfmailand
Merge pull request #146 from ZPak/sbl-dev

Made add/remove buttons uniform
Remove unused imports
Merge pull request #148 from sfmailand/sbl-dev

Remove unused imports
Merged in the most recent sbl-dev
So it really didn't mess with much at all. It took about 2 minutes to manually merge. Seeing as I had already merged in the most recent pull request before the change to use Requirement IDs was merged in...
Committed by: Alec Thompson - ajthompson
Manually merged again
Seriously, I'll never get this automatically mergeable at the rate you guys are submitting pull requests.  But it was still a 30 second fix.

Committed by: Alec Thompson - ajthompson
Change name from Fibbonacci deck to Default Deck and values to the ones listed in requirement manager. Also changed name of Other deck to Lightning Deck.
authors: mamora, swconley
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/view/NewGameTab.java
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/view/NewGameTab.java
Merge pull request #150 from labatbouta/sbl-dev

Change names of decks in NewGameTab and change values
Make the team members' estimations table non-editable.

Reported-by: lhnguyenduc
Signed-off by: Long Nguyen Duc Hoang <lhnguyenduc@wpi.edu>