Fix : some & -> &amp;
WIP : Admin for Carriers (Activate/Desactivate)
Fix : It was a bad idea to add COL in the code name of new carriers
Merge remote-tracking branch 'upstream/develop' into develop
WIP : Admin for carriers
WIP : Admin for carriers
Merge pull request #685 from frederic34/develop

WIP : Admin for Carriers
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop