[MERGE] [FIX] Properly escape values in templates
[MERGE] [FIX] Properly escape values in templates

MarkusTeufelberger/openerp-web,gisce/openerp-web,MarkusTeufelberger/openerp-web,splbio/openerp-web,splbio/openerp-web,gisce/openerp-web,MarkusTeufelberger/openerp-web,splbio/openerp-web,gisce/openerp-web