Development made easy
Merge branch 'web' of github.com:UniversalMediaServer/UniversalMediaServer into web