Contextmenu changed
Merge branch 'develop' of github.com:EtherApp/EtherApp into develop