Cleanup of "dead" trayicons.
Merge branch 'develop' of github.com:Starcounter/Starcounter into develop
Fixed invalid configuration parameter error
fixed typo
Changed member back to private for field that should be private.
Merge branch 'develop' into issue/1753