Merge pull request #2637 from grandoc/develop

htdocs/adherents/admin/public.php

htdocs/adherents/card.php

htdocs/admin/dict.php

htdocs/cashdesk/admin/cashdesk.php

htdocs/categories/class/categorie.class.php

htdocs/compta/bank/releve.php

htdocs/compta/stats/index.php

htdocs/core/lib/memory.lib.php

htdocs/core/lib/project.lib.php

htdocs/core/lib/tax.lib.php

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

...modules/project/task/doc/doc_generic_task_odt.modules.php

htdocs/core/tpl/admin_extrafields_add.tpl.php

htdocs/expensereport/class/expensereport.class.php

htdocs/livraison/card.php

htdocs/opensurvey/card.php

htdocs/product/composition/card.php

htdocs/product/stock/valo.php

htdocs/projet/note.php

htdocs/societe/canvas/company/tpl/card_view.tpl.php