[MERGE]merge with latest trunk

bzr revid: csn@openerp.com-20140417090153-m6d65ubew0wlr9ic

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

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

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

diff --cc addons/web/static/src/xml/base.xml
Simple merge