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

htdocs/categories/categorie.php

htdocs/categories/class/categorie.class.php

htdocs/categories/fiche.php

htdocs/contact/list.php

htdocs/core/lib/contact.lib.php

htdocs/core/modules/mailings/contacts4.modules.php

htdocs/core/modules/mailings/modules_mailings.php

htdocs/core/modules/modCategorie.class.php

htdocs/install/mysql/migration/3.4.0-3.5.0.sql

htdocs/install/mysql/tables/llx_categorie_contact.key.sql

htdocs/install/mysql/tables/llx_categorie_contact.sql

htdocs/langs/en_US/categories.lang

htdocs/langs/en_US/mails.lang

htdocs/langs/fr_FR/categories.lang

htdocs/langs/fr_FR/mails.lang