Merge proposals dependent on lp://qastaging/~cmsa/openerp.pt-br-localiz/l10n_br_company_address

1. l10n_br_company_address
2. Dependent merge proposals