Merge branch 'master' into desarrollo_newclient_review

Conflicts:
	.gitignore
	base-only-odoo.cfg