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

htdocs/contrat/class/contrat.class.php

htdocs/core/lib/company.lib.php

htdocs/core/lib/functions.lib.php

htdocs/langs/en_US/boxes.lang

htdocs/langs/fr_FR/boxes.lang

htdocs/societe/soc.php

htdocs/theme/amarok/img/warning.png

htdocs/theme/amarok/style.css.php

htdocs/theme/auguria/style.css.php

htdocs/theme/bureau2crea/style.css.php

htdocs/theme/cameleo/style.css.php

htdocs/theme/eldy/style.css.php

htdocs/user/fiche.php

htdocs/user/param_ihm.php