[REM] association: empty file
[REM] association: removing a file is good, but it removing from the manifest is better
Merge branch 'master' of https://github.com/odoo/odoo into master-linux64