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

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

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

diff --cc addons/web_calendar/static/src/js/web_calendar.js
Simple merge

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

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

diff --cc openerp/addons/base/module/wizard/base_module_upgrade_view.xml
Simple merge

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