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

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/account_voucher/voucher_sales_purchase_view.xml
Simple merge

diff --cc addons/gamification/models/challenge.py
Simple merge

diff --cc addons/hr/hr.py
Simple merge

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/mail/mail_thread.py
Simple merge

diff --cc addons/mass_mailing/views/mass_mailing.xml
Simple merge

diff --cc addons/product/product.py
Simple merge

diff --cc addons/stock/stock_view.xml
Simple merge

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/js/search.js
Simple merge

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

diff --cc addons/website/static/src/js/website.editor.js
Simple merge

diff --cc addons/website_forum/controllers/main.py
Simple merge

diff --cc addons/website_mail_group/views/website_mail_group.xml
Simple merge

diff --cc addons/website_sale/views/templates.xml
Simple merge

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

diff --cc openerp/addons/base/ir/ir_actions.xml
Simple merge

diff --cc openerp/osv/fields.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge