Working version.
Merge branch 'master' of https://github.com/d-shout/shout_wysiwyg