Merge branch 'develop' of https://github.com/Dolibarr/dolibarr 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/contrat/fiche.php

htdocs/core/class/menubase.class.php

htdocs/core/lib/agenda.lib.php

htdocs/core/lib/functions.lib.php

htdocs/core/lib/security2.lib.php

htdocs/core/lib/usergroups.lib.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/core/tpl/login.tpl.php

htdocs/imports/import.php