WIP
Merge branch 'trunk' of https://github.com/alca259/OdooManagerService.git