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

htdocs/comm/mailing/class/mailing.class.php

htdocs/comm/mailing/fiche.php

htdocs/core/class/conf.class.php

htdocs/core/class/doleditor.class.php

htdocs/core/class/hookmanager.class.php

htdocs/core/js/editinplace.js

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

htdocs/install/mysql/tables/llx_mailing.sql

htdocs/main.inc.php