Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Refactor user to PlanningPokerUser
Manually merge
Fixed User->PlanningPokerUser refactor
Updated planningpoker/user addresses in PlanningPokerUser controllers to planningpoker/planningpokeruser so the entity manager works.

Committed by: ajthompson, sfmailand
Merge pull request #287 from ajthompson/refactor

Refactor the new User class to PlanningPokerUser
Change import in entity manager to PlanningPokerUser
Merge pull request #289 from sfmailand/sbl-dev

Change import in entity manager to PlanningPokerUser
Tested by: ajthompson
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Disable aimField box in intitial user information pane

This box to enter the aim for the user is not currently active or used. Since it is not used, it shouldn't be active until we build in the functionality for IM messages to be sent. My user model can handle the IM field being empty/null.
Protection agains invalid emails in Mailer
The Mailer class now will no longer add invalid emails that would cause an exception.  These are null, empty, and zero-length email addresses.  It will also not send the email if there are no emails present in the list of recipients for the Mailer.

Committed by: Alec Thompson - ajthompson
Merge in the Project Deserializer fix
This uses string split to isolate the owner and team member JSON strings, and then passes them to the appropriate deserializers.

Committed by: ajthompson, bnurbekov
Adds all necessary logic to final estimates, and adds archived field to games
Merge pull request #292 from ajthompson/mailer-noemail-patch

Protection agains invalid emails in Mailer
Merge pull request #294 from friscis/sbl-dev

Adds all necessary logic to final estimates, and adds archived field to games
Merge pull request #291 from sfmailand/sbl-dev

Disable aimField box in intitial user information pane
Tested by: ajthompson
Merge pull request #288 from labatbouta/sbl-dev

adds small comments to PlanningPoker, PlanningPokerButtons, and AddPlanningPokerFinalEstimateController Classes
Merge pull request #293 from ajthompson/project-deserializer-hack

Merge in the Project Deserializer fix
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
 makes network private and creates setter for network testing