Fix: Compatibility with v4 of ckeditor (for debian)
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	htdocs/main.inc.php