Merge remote-tracking branch 'odoo/master' into master-odoo-cmd-fme

CONTRIBUTING.md

README.md

addons/account/product_view.xml

...ns/account_analytic_analysis/account_analytic_analysis.py

...ount_analytic_analysis/account_analytic_analysis_view.xml

addons/account_anglo_saxon/product_view.xml

addons/base_action_rule/base_action_rule_view.xml

addons/event/email_template.xml

addons/event/event.py

addons/event/event_view.xml

addons/event_sale/event_sale_view.xml

addons/hr_expense/hr_expense.py

addons/hr_expense/hr_expense_view.xml

addons/mass_mailing/__openerp__.py

addons/mass_mailing/data/mass_mailing_data.xml

addons/mass_mailing/data/mass_mailing_demo.xml

.../mass_mailing/static/src/img/blocks/button_newsletter.png

...mass_mailing/static/src/js/website_mass_mailing.editor.js

addons/mass_mailing/static/src/js/website_mass_mailing.js

addons/mass_mailing/views/snippets.xml