Removed redundant logging and modified existing logging slightly
Formatting
Removed unused imports
Add sorting to media lib
Revert 6aedd81

See comments in #335
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Fixed adaptive bitrate setting being disabled when it should've been enabled
Fixed a bug reported in
http://www.universalmediaserver.com/forum/viewtopic.php?f=9&t=1874
Merge remote-tracking branch 'UMS/master'
Update the previous commit
Formatting
Updated support for external subtitles streaming
Formatting
Update subtitles support
Update previous commit
Bumped version to 4.0.1
Enabled automatic updating to 4.0.0 on Windows
Update messages_es.properties

Update from commit c626fbe to 97e8192
Merge pull request #342 from AlfredoRamos/patch-1

Update messages_es.properties
Updated changelog