[MERGE]: merging from the same branch

addons/account/report/invoice.rml

...t_invoice_layout/report/report_account_invoice_layout.rml

...account_invoice_layout/report/special_message_invoice.rml

addons/base_setup/base_setup_installer.xml

addons/base_setup/installer.py

addons/crm/__openerp__.py

addons/crm/crm.py

addons/crm/crm_lead_view.xml

addons/crm/wizard/__init__.py

addons/crm/wizard/crm_forward_to_partner.py

addons/crm/wizard/crm_forward_to_partner_view.xml

addons/crm/wizard/crm_send_email.py

addons/crm/wizard/crm_send_email_view.xml

addons/l10n_ch/report/bvr.rml

addons/l10n_ch/report/invoice.rml

addons/purchase/partner_view.xml

addons/purchase/report/order.rml

addons/purchase/report/request_quotation.rml

addons/report_intrastat/report/invoice.rml

addons/sale/report/order.rml