Merge branch 'master' into web
Merge branch 'web' of github.com:UniversalMediaServer/UniversalMediaServer into web
Merge branch 'web' of github.com:UniversalMediaServer/UniversalMediaServer into web
Use web.css as local file