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

merge new strings for train 15