Merge branch 'desktop-2.2.1'
add adding settings menu
prevent two insances of handler
Merge master
bump version desktop 2.2.2
bump version desktop 2.2.2-SNAPSHOT