[MERGE] forward port of branch saas-4 up to a4bc65c

diff --cc addons/l10n_fr_hr_payroll/report/fiche_paye.py
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge

diff --cc addons/web_calendar/static/src/js/web_calendar.js
Simple merge

diff --cc addons/website/models/ir_http.py
Simple merge

diff --cc addons/website/views/website_templates.xml
Simple merge

diff --cc openerp/report/report_sxw.py
Simple merge