py3 support merged

CHANGES.rst

@@ -1,7 +1,6 @@
 0.2.3 (2016-08-09)
 ------------------
 - Add Python 3 support for footer and header
-  Thanks to Mattia Larentis for his help.
 
 0.2.2 (2016-06-11)
 ------------------

docxtpl/__init__.py

@@ -172,7 +172,7 @@ class RichText(object):
 
         if not isinstance(text, six.text_type):
             text = text.decode('utf-8',errors='ignore')
-        text = escape(text).replace('\n','<w:br/>').replace('\a','</w:t></w:r></w:p><w:p><w:r><w:t xml:space="preserve">')
+        text = escape(text).replace('\n','</w:t><w:br/><w:t>').replace('\a','</w:t></w:r></w:p><w:p><w:r><w:t xml:space="preserve">')
 
         prop = u''