fixed #312, work on the settings menu
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM