Added an icon image and a tray icon.
Merge remote-tracking branch 'origin/master'