[MERGE] forward port of branch saas-5 up to b1c0bc0b

.gitignore

addons/auth_oauth/controllers/main.py

addons/auth_oauth/res_users.py

addons/calendar/calendar.py

addons/crm/sales_team_view.xml

addons/delivery/sale.py

addons/edi/static/src/js/edi.js

addons/event_sale/event_sale.py

addons/gamification/models/goal.py

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

addons/mail/mail_thread.py

addons/mail/wizard/mail_compose_message.py

addons/mass_mailing/controllers/main.py

addons/mass_mailing/data/mass_mailing_demo.xml

addons/mass_mailing/models/mass_mailing.py

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

addons/mass_mailing/views/snippets.xml

addons/mass_mailing/wizard/mail_compose_message.py

addons/procurement/procurement.py

addons/product/pricelist_view.xml