[MERGE] Forward-port saas-4 up to bf135ad0

addons/crm_partner_assign/crm_partner_assign.py

addons/event_sale/__openerp__.py

addons/event_sale/security/ir.model.access.csv

addons/payment_paypal/models/paypal.py

addons/payment_paypal/tests/test_paypal.py

addons/web/static/src/js/views.js

addons/website_blog/static/src/css/website_blog.css

addons/website_blog/static/src/css/website_blog.sass

...te_blog/static/src/xml/website_blog.inline.discussion.xml

addons/website_blog/views/website_blog_templates.xml

addons/website_crm_partner_assign/__openerp__.py

...ebsite_crm_partner_assign/data/res_partner_grade_demo.xml

addons/website_event_sale/security/ir.model.access.csv

addons/website_mail/controllers/main.py

addons/website_mail/views/snippets.xml

addons/website_mail/views/website_mail.xml

addons/website_mail_group/__openerp__.py

addons/website_mail_group/controllers/main.py

...ite_mail_group/static/src/js/website_mail_group.editor.js

...te_mail_group/static/src/js/website_mail_group.snippet.js