Simplified logic
Formatting
Try to add some of the old Samsung Galaxy S3 MEncoder options
Fixed subfolder names
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer