Add confirmation dialog for delete
Merge branch 'master' into editor