Got settings for 1280x720 and 1280x1024 into a reasonable state.
Merge branch 'master' of https://github.com/Salanmander/ProjectOdysseus