[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.