Merged settingsDialog to master & fixed merge conflicts