Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev', 3.0.5, fixes two issues
- one issue with cantina opening hours
- one issue with desktop notifications being sent when computer is idle/locked
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
options/affiliation: removed Delta hardware and Abakus features
popup: tiny fix, linked to affiliation website when feed is n/a
manifest: bumped version number
options: readded Abakus
affiliation: disabled Abakus' hardwarefeatures
constants: turned off debug
manifest: bumped version number
Merge branch 'master' into dev