Add trayIcon, trayMenu & trayController
Merge Github branch