Thank you fixes

More updates to templates; and importantly fixes an issue in Catalan
(and other languages) where &nbsp; is stripped.

It turnes out that I dont need html_entity_decode() because loadXML
will do that for me. And therefore I don't need mb_encode because
I'm no longer potentially breaking encoding :)

Change-Id: I0699552ef4067b4734a4e3990c4ad6b14679bd18
Merge remote-tracking branch 'origin/master' into HEAD