[MERGE] forward port of branch saas-6 up to 51040b6d

addons/analytic/models/analytic.py

addons/base_action_rule/base_action_rule.py

addons/claim_from_delivery/claim_delivery_view.xml

addons/crm_claim/crm_claim_view.xml

addons/crm_claim/report/crm_claim_report.py

addons/crm_claim/res_partner_view.xml

addons/im_livechat/static/src/js/im_livechat.js

addons/mail/models/mail_thread.py

addons/mail/tests/test_mail_gateway.py

addons/mrp/product.py

addons/payment_sips/__init__.py

addons/payment_sips/__openerp__.py

addons/payment_sips/controllers/__init__.py

addons/payment_sips/controllers/main.py

addons/payment_sips/data/sips.xml

addons/payment_sips/models/__init__.py

addons/payment_sips/models/sips.py

addons/payment_sips/static/description/icon.png

addons/payment_sips/static/src/img/sips_icon.png

addons/payment_sips/static/src/img/sips_logo.png