Merge pull request #861 from sylus/master

CKEditor 4.1 + Wysiwyg
Wrong Commit SHA for WYSIWYG module
Merge pull request #6 from sylus/master

Wrong Commit SHA for WYSIWYG module