merge strings for train 13
Merge pull request #15 from mozilla/merge-templates-train-13

merge strings for train 13