Merge pull request #249 from FrozenNode/dev

Mergin a couple of hotfixes back into master
Merge pull request #251 from FrozenNode/dev

hotfix for wysiwyg issues
Merge branch 'master' of git@github.com:FrozenNode/Laravel-Administrator.git into dev