Merge proposals dependent on lp:~openerp-dev/openobject-doc/v61-web_page-kjo

lp:~openerp-dev/openobject-doc/v61-web_page-kjo has no merge proposals.