Merge pull request #5 from UniversalMediaServer/web

Web - Keeping it Updated
Merge pull request #8 from UniversalMediaServer/web

Fix mergwe issue
Merge branch 'web' of https://github.com/DeFlanko/UniversalMediaServer into web