Merge branch 'master' into new_media
Add cfg to remove the ExternalSubs text
Sync
Sync
Fix resume done in recentlyplayed
Merge branch 'new_media' of github.com:UniversalMediaServer/UniversalMediaServer into new_media