Put the template tags in the right order
Merge pull request #334 from alex/linebreaks-to-br

Put the template tags in the right order