Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop

htdocs/admin/carrier.php

htdocs/admin/confexped.php

htdocs/admin/expedition.php

htdocs/admin/livraison.php

htdocs/core/menus/standard/eldy.lib.php

.../modules/expedition/methode_expedition_chrono.modules.php

...ore/modules/expedition/methode_expedition_gls.modules.php

...e/modules/expedition/methode_expedition_kiala.modules.php

...ore/modules/expedition/methode_expedition_ups.modules.php

htdocs/expedition/class/expedition.class.php

htdocs/index.php

htdocs/install/mysql/data/llx_c_shipment_mode.sql

htdocs/install/mysql/migration/3.3.0-3.4.0.sql

htdocs/install/mysql/tables/llx_c_shipment_mode.sql

htdocs/main.inc.php