Merge branch 'master' of /Users/Bakalian/simpleFTP with conflicts.
Fixing JTree issues