Set of changes. Currently we have a working copy.
Merge branch 'master' of https://github.com/Zvirja/TrayPluginProductivityKit