Merge proposals dependent on lp://qastaging/~vauxoo/openerp-mexico-localization/characters_specials-dev-jc

1. characters_specials-dev-jc
2. Dependent merge proposals