ckeditor+kcfinder
Merge pull request #7 from protectedfor/master

ckeditor+kcfinder