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

htdocs/adherents/class/adherent.class.php

htdocs/adherents/list.php

htdocs/comm/prospect/list.php

htdocs/compta/stats/cabyprodserv.php

htdocs/compta/stats/casoc.php

htdocs/contact/list.php

htdocs/core/db/mysql.class.php

htdocs/core/lib/company.lib.php

htdocs/core/lib/contact.lib.php

htdocs/core/lib/functions.lib.php

htdocs/core/lib/functions2.lib.php

htdocs/core/lib/member.lib.php

htdocs/core/lib/product.lib.php

htdocs/fourn/list.php

htdocs/install/fileconf.php

htdocs/langs/en_US/install.lang

htdocs/product/composition/card.php