merge
Merge branch 'master' of github.com:iw3hxn/LibrERP

Conflicts:
	dt_product_serial/security/ir.model.access.csv