Task 973 : Incoterm Management
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

Conflicts:
	htdocs/expedition/fiche.php
Fix : Task 973 : Incoterm Management.
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Fix : Task 973 : Incoterm Management
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Merge
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
Merge branch 'develop' of github.com:atm-maxime/dolibarr into develop