update on serverbrowser
fixing merge conflict
Merge branch 'ServerBrowserGUI' of https://github.com/Tadimsky/vooga into ServerBrowserGUI

merge.