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

...ns/account_analytic_analysis/account_analytic_analysis.py

...ount_analytic_analysis/account_analytic_analysis_view.xml

addons/point_of_sale/wizard/pos_payment.py

addons/project_timesheet/project_timesheet.py

addons/report_webkit/webkit_report.py

addons/web/static/src/js/view_form.js

addons/web/static/src/xml/base.xml

addons/web_kanban/static/src/css/kanban.css

addons/web_kanban/static/src/css/kanban.sass

addons/website/static/src/js/website.snippets.editor.js

addons/website/views/website_templates.xml

addons/website_crm/controllers/main.py

addons/website_event_track/views/website_event.xml

openerp/addons/base/ir/ir_cron.py

openerp/addons/base/ir/ir_model.py

openerp/addons/base/ir/ir_qweb.py

openerp/addons/base/module/module.py

openerp/netsvc.py

openerp/osv/fields.py

openerp/osv/orm.py