Add apply button to settings dialog.
Merge branch 'master' into applySettings.
Merge pull request #99 from MichaelBeeu/applySettings

Apply settings