electron-app desktop integration#1

Fo-ox wants to merge 2 commits intomasterFo-ox/socket-client:masterfrom

desktop-integrationFo-ox/socket-client:desktop-integrationCopy head branch name to clipboard