Merge branch 'bzr/openobject-server-7.0'
Merge branch 'bzr/openerp-web-7.0'