Merge pull request #255 from FrozenNode/dev

forgot to add wysiwyg fix to settings pages
Merge branch 'dev' of https://github.com/jijoel/Laravel-Administrator into dev