suite cablage services
Merge branch 'master' of https://github.com/michelre/aerodrome-client

Conflicts:
	web/fr/common/model/service-forfait.js
	web/fr/common/model/service-tonnage.js
	web/fr/common/model/weight-range.js
Merge branch 'master' of https://github.com/michelre/aerodrome-client