24789 - Roundy's - Welcome Email link update/fix.
Merge pull request #610 from gsn/test

24789 - Roundy's - Welcome Email link update/fix.
Merge pull request #611 from gsn/master

merge master to staging