Formatting
Merge branch 'resume_fix' of github.com:UniversalMediaServer/UniversalMediaServer into resume_fix
Formatting