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

build.xml

dev/codesniffer/jenkins_ruleset.xml

dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql

dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql

dev/dbmodel/emulate_oscommerce/llx_osc_order.sql

dev/dbmodel/emulate_oscommerce/llx_osc_product.sql

htdocs/admin/dict.php

htdocs/compta/facture.php

htdocs/compta/facture/class/facture.class.php

htdocs/contact/fiche.php

htdocs/core/modules/DolibarrModules.class.php

...e/modules/facture/doc/doc_generic_invoice_odt.modules.php

htdocs/core/modules/import/import_csv.modules.php

htdocs/imports/import.php

htdocs/index.php

htdocs/install/mysql/data/llx_20_c_departements.sql

htdocs/install/mysql/data/llx_accounting.sql

htdocs/install/mysql/data/llx_holiday_config.sql

htdocs/install/mysql/migration/2.6.0-2.7.0.sql

htdocs/install/mysql/migration/3.2.0-3.3.0.sql