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