Merge branch 'desktop'
ignoring desktop-only changes in merge
Merge branch 'desktop'
removed obsolete files script