fix a-vj issue
Merge branch 'master' of https://github.com/2b3ez/FileManager4TinyMCE

Conflicts:
	tinymce/plugins/filemanager/dialog.php