Merge pull request #253 from FrozenNode/dev

Final wysiwyg hotfix
forgot to add wysiwyg fix to settings pages