Changed ffmpeg subs implementation
Moved time-string-time conversion to SubtitleUtils
Merge remote-tracking branch 'UMS/master' into UMS-master