wip
merge with master
wip
Merge branch 'master' into use-dialogs
using dialogs to view / edit items
fix events form