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