Fix concurrent modification error
Merge branch 'master' of https://github.com/UniversalMediaServer/UniversalMediaServer into web2
Codefix
Merge pull request #54 from skeptical/web2

Fix concurrent modification error