final wysiwyg hotfix with actual resolution
Merge branch 'master' of git@github.com:FrozenNode/Laravel-Administrator.git into dev
Merge pull request #253 from FrozenNode/dev

Final wysiwyg hotfix