[MERGE] Forward-port of 8.0 up to d32d120

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/xml/base.xml
Simple merge

diff --cc addons/web/views/webclient_templates.xml
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/addons/base/ir/ir_attachment.py
Simple merge

diff --cc openerp/addons/base/ir/ir_qweb.py
Simple merge

diff --cc openerp/addons/base/ir/ir_ui_view.py
Simple merge