Merge branch 'master' of /Users/galafit/IdeaProjects/dreamrec with conflicts.
Button Advanced was added to SettingsWindow