Merge proposals dependent on lp:~savoirfairelinux-openerp/openobject-addons/crossovered_unicode_1292245

1. crossovered_unicode_1292245
2. Dependent merge proposals