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

htdocs/categories/class/categorie.class.php

htdocs/categories/index.php

htdocs/compta/deplacement/document.php

htdocs/compta/deplacement/fiche.php

htdocs/core/lib/trip.lib.php

htdocs/core/tpl/bloc_showhide.tpl.php

htdocs/document.php

htdocs/ecm/class/ecmdirectory.class.php

htdocs/public/demo/index.php