Cleaned up all errors in the merge. A lot of casting NetworkUser to WiseguysUser that makes things a bit messy - would be nice if we can get rid of WiseguysUser entirely in the IPlayer refactor. Even if not, we can clean it up a bit more.