#comment finished email-friend page
Merge branch 'master' into FYNH-EMAIL-FRIEND