Merge pull request #784 from lexware/master

Added System Tray