Cleanup of "dead" trayicons.
Merge branch 'develop' of github.com:Starcounter/Starcounter into develop