[MERGE ] Merge lp:~openerp-dev/openobject-addons/trunk-contact-google-sync