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

addons/email_template/email_template.py

addons/hr_expense/hr_expense.py

addons/l10n_ro/res_partner.py

addons/mail/mail_thread.py

addons/mrp_repair/mrp_repair.py

addons/product/product_view.xml

addons/stock/stock_view.xml

addons/web/controllers/main.py

addons/web/static/src/css/base.css

addons/web/static/src/css/base.sass

addons/web/static/src/js/chrome.js

addons/web/static/src/js/data.js

addons/website_sale/static/src/js/website_sale.js

openerp/addons/base/ir/ir_attachment.py

openerp/addons/base/ir/ir_mail_server.py

openerp/addons/base/ir/ir_qweb.py

openerp/addons/test_converter/models.py

openerp/addons/test_converter/tests/__init__.py

openerp/addons/test_converter/tests/test_gbf.py

openerp/models.py