Fixing a XML/HTML content rendering of the WYSIWYG editor (Aurore's work)

Conflicts:
	war-core/src/main/webapp/wysiwyg/jsp/htmlEditor.jsp