Adds pick/incorporate functionnality for product_natures/variants/categories
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/arb/nomenclatures.yml
	config/locales/eng/nomenclatures.yml
	config/locales/fra/nomenclatures.yml
	config/locales/jpn/nomenclatures.yml
	config/locales/spa/nomenclatures.yml
	config/nomenclatures/product_nature_variants.xml