Merge pull request #597 from gsn/master

Merged from beta.
Marianos (218). Facebook link
24790 - Mariano's - New Tastemaker, Doug Psaltis, to go live 12/17: update for dougPsaltisHeader with orange stripe and text
Merge pull request #599 from gsn/test

Test