merge
merging
Merge branch 'ServerBrowserGUI' of https://github.com/Tadimsky/vooga into ServerBrowserGUI

merge
:wq
.
Changes to JRE6