Merge pull request #253 from intoccabil/master

Fixed file selection with TinyMCE 4.
minified version including pull #253
 adding ending delimiter '/' to regex pattern (now java conn. is
up-to-date)
Merge remote-tracking branch 'upstream/master'