Merge pull request #160 from greboid/newserverdialog

Stop using StreamUtils methods.
Specify charset in TextFile.