Merge pull request #1 from odoo/master

merge service code