Added ServerBrowser and fixed several bugs.
Merge fix.