Merge branch 'desktop-2.2.0'
Update README.md
add settings menu
Merge master
bump version desktop 2.2.1
bump version desktop 2.2.1-SNAPSHOT