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

htdocs/adherents/card_subscriptions.php

htdocs/adherents/class/adherent.class.php

htdocs/adherents/document.php

htdocs/adherents/fiche.php

htdocs/adherents/index.php

htdocs/adherents/info.php

htdocs/adherents/note.php

htdocs/adherents/stats/geo.php

htdocs/adherents/stats/index.php

htdocs/adherents/type.php

htdocs/categories/categorie.php

htdocs/filefunc.inc.php

htdocs/user/fiche.php