partial commit
Merge remote-tracking branch 'origin/master'
fixing bug with context menus
Merge remote-tracking branch 'origin/master'