add translation for product_nautre_prices
Merge branch 'master' of https://github.com/ekylibre/ekylibre
Merge branch 'master' of https://github.com/ekylibre/ekylibre
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	config/locales/fra/action.yml
Merge branch 'master' of https://github.com/ekylibre/ekylibre
update demo.task to include arrival-departure dates and places.
Merge branch 'master' of https://github.com/ekylibre/ekylibre