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

build.xml

htdocs/admin/system/database.php

htdocs/admin/system/index.php

htdocs/categories/categorie.php

htdocs/categories/class/categorie.class.php

htdocs/categories/edit.php

htdocs/categories/index.php

htdocs/categories/photos.php

htdocs/categories/viewcat.php

htdocs/commande/class/commande.class.php

htdocs/core/class/conf.class.php

htdocs/core/class/ldap.class.php

htdocs/core/db/mysqli.class.php

htdocs/core/lib/functions.lib.php

htdocs/core/lib/ws.lib.php

htdocs/core/modules/DolibarrModules.class.php

htdocs/install/etape1.php

htdocs/install/inc.php

htdocs/user/fiche.php

quickbuild.xml