Merge pull request #19 from 123DMWM/master

Added software column to the server list
Combined "Location" (for MC.net servers) and "Software" (for CC.net servers) columns on the server list dialog.