wysiwyg didn't work due to 'jQuery.noConflict()' call from jQuery plugin
Merge pull request #1 from langerheiko/master

wysiwyg didn't work due to 'jQuery.noConflict()' call from jQuery plugin