Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into subtitles2
Merge branch 'subtitles' of github.com:UniversalMediaServer/UniversalMediaServer into subtitles2
Formatting
Rename and deprecate some methods used together in Mencoder and FFmpeg
Update CHANGELOG