Merge dev branch

[ifndefJOSH]

Fixes:

• Fix the bug where multiple model/properties checks in a row produce incorrect results on the second, third, etc., one.
• Fix the bug where multiple properties with the same model produce incorrect results
• Fix the bug where the GUI and the CLI produce different results for the 2.5 method
• Properly package icon theme for xSTAMINA on MacOS (and eventually Windows maybe)
  • Currently planning on using KDE's breeze icons, which are GPLv3 licensed and therefore compatible with xSTAMINA licensing Using Bootstrap's icons, which are MIT licensed
• Add support for rewards properties (only will estimate, not provide a bound)
• Some improvements to editor
  • Strings now have priority over constants in syntax highlighting
  • When last line (after indentation) starts with //, editor will now insert // on next line.