description
ckeditor limited config
Merge branch 'master' into tinyMCE-support

Conflicts:
	index.html