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

htdocs/categories/categorie.php

htdocs/comm/mailing/cibles.php

htdocs/contact/class/contact.class.php

htdocs/core/admin_extrafields.inc.php

htdocs/core/lib/admin.lib.php

htdocs/core/lib/invoice2.lib.php

htdocs/core/modules/mailings/contacts1.modules.php

htdocs/core/modules/mailings/contacts2.modules.php

htdocs/core/modules/mailings/contacts3.modules.php

htdocs/core/modules/mailings/pomme.modules.php

...odules/mailings/thirdparties_services_expired.modules.php

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

htdocs/langs/en_US/mails.lang

htdocs/langs/fr_FR/mails.lang

htdocs/societe/consumption.php

htdocs/societe/document.php

htdocs/societe/note.php

htdocs/societe/notify/fiche.php

htdocs/societe/soc.php

htdocs/theme/amarok/style.css.php