Merge pull request #591 from gsn/master

Merged from master.
Fixed couple links in emails.
24790 - Mariano's - New Tastemaker, Doug Psaltis, to go live 12/17
Merge pull request #593 from gsn/test

Test