added verification before edit and delete
Merge branch 'dev'