Categories: adding, editing and deleting
Merge branch 'dev'