ulserver largely working I think, some netvid fixes
Resolving merge conflicts in mzbot
Merge branch 'queue' of github.com:zbanks/musicazoo into queue