Removed unused variables
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into new_media
Fixed logic so it actually works heh