TinyMCE 4.x editor settings is no longer in tinymce.settings but in tinymce.activeEditor.settings
When upload throws an error, it displays the error message instead of the html of the generic error page.
Merge branch 'master' of https://github.com/ahumeniy/TinyFileManager.NET