Merge branch 'master' into new_media
Add cfg to remove the ExternalSubs text
Sync
Added H.264 transcoding quality option

It works the same way as the MPEG-2 one
Made vertical spacing more uniform
Sync
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Simplify the code of string to time conversion
Update
Formatting
Updated changelog
Fix resume done in recentlyplayed
Merge branch 'new_media' of github.com:UniversalMediaServer/UniversalMediaServer into new_media
Fix resume mgmt bug
Sync
Add timestamp to monitor file generation
Number parse error