Fixes remaining Controller#human_name call
Adds a valid "placeholder" for OutgoingDelivery::invoice
Replaces bad interpolation attribute
Adds a setter for locale through env variable LOCALE
Simplifies deliveries
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	Gemfile.lock
	config/locales/arb/nomenclatures.yml
	config/locales/eng/complement.yml
	config/locales/eng/nomenclatures.yml
	config/locales/fra/complement.yml
	config/locales/fra/nomenclatures.yml
	config/locales/jpn/nomenclatures.yml
	config/locales/spa/nomenclatures.yml
Merge branch 'master' of github.com:ekylibre/ekylibre
Restores original leaflet.js.