edit popup
Merge branch 'master' of github.com:shiftplanning/foxydb