Merge remote-tracking branch 'odoo/master' into master-web-graph-doc-ged

README.md

addons/base_import/static/src/xml/import.xml

addons/web_kanban/static/src/js/kanban.js

addons/website_forum_doc/views/website_doc.xml

addons/website_sale/static/src/js/website_sale.js

openerp/addons/base/ir/ir_ui_view.py

openerp/addons/base/tests/test_views.py

openerp/cli/scaffold.py

openerp/cli/scaffold/__openerp__.jinja2

openerp/cli/scaffold/models.jinja2

setup.py