Try to display a more helpful error for the user when something is using the UMS HTTP port
Update h2database version
Update FFmpeg subtitles font size
Stop cross-detection of Samsung products (Pull request 117)
Update calculation of FFmpeg subtitles size
Merge remote-tracking branch 'UMS/master'
Clean bug in FFmpeg subtitles logic
Clean some bugs reported by FindBugs in Eclipse
Ensure file exists before browsing for subtitles
Expanded filename rewriting
Merge pull request #121 from skeptical/dev

Ensure file exists before browsing for subtitles
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Fixed x264 encoding with MEncoder
Updated changelog
Merge remote-tracking branch 'UMS/master' into ffmpeg_subs