Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state
Merged with upstream master
Fix the syntax issue with if blocks
Fix end of line in Application.cpp
Merge pull request #3719 from samcake/tot

Fix the problem of actual framerate target not being true to the value ...