Merge remote-tracking branch 'Upstream/develop' into develop-28

htdocs/admin/company.php

htdocs/comm/propal.php

htdocs/comm/propal/list.php

htdocs/commande/card.php

htdocs/compta/facture.php

htdocs/core/actions_extrafields.inc.php

htdocs/core/class/CMailFile.class.php

htdocs/core/class/conf.class.php

htdocs/core/class/html.form.class.php

htdocs/core/lib/admin.lib.php

htdocs/core/lib/functions.lib.php

htdocs/core/lib/functions2.lib.php

htdocs/core/modules/mailings/example.modules.php

htdocs/core/modules/modMailmanSpip.class.php

htdocs/core/tpl/admin_extrafields_add.tpl.php

htdocs/core/tpl/admin_extrafields_edit.tpl.php

htdocs/core/tpl/document_actions_post_headers.tpl.php

htdocs/expedition/card.php

htdocs/expensereport/card.php

htdocs/expensereport/class/expensereport.class.php