More bug fixes for Server and username lists
Merge branch 'master' of https://github.com/LiamDeGrey/Mansion-Bandit