Started adding support for popup notifications and adjustments to new core
Merge remote-tracking branch 'upstream/master'
Upstream adaption
Merge pull request #200 from mannol1/master

Core adjustments