Implemented Settings, changed ScreenSize (the UI-Scaling-Problem isn't really solved though)
Merge remote-tracking branch 'origin/master'