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

htdocs/admin/fckeditor.php

htdocs/core/class/doleditor.class.php

htdocs/core/filemanagerdol/browser/default/browser.php

htdocs/core/filemanagerdol/connectors/php/config.php

htdocs/core/filemanagerdol/connectors/php/upload.php

htdocs/core/lib/files.lib.php

htdocs/core/lib/functions2.lib.php

htdocs/core/modules/modFckeditor.class.php

htdocs/core/modules/modWebsites.class.php

htdocs/document.php

htdocs/install/mysql/migration/3.9.0-4.0.0.sql

htdocs/install/mysql/tables/llx_website.sql

htdocs/install/upgrade2.php

htdocs/langs/en_US/admin.lang

htdocs/langs/en_US/main.lang

htdocs/langs/en_US/website.lang

htdocs/main.inc.php

htdocs/public/websites/index.php

htdocs/theme/eldy/ckeditor/config.js

htdocs/theme/eldy/style.css.php