bump version desktop 2.2.0-SNAPSHOT
add settings menu
Merge master
bump version desktop 2.2.1
Merge branch 'desktop-2.2.1'