Changes for edit button and delete class buttons
Merge pull request #1819 from ssushma/dev-branch

Changes for edit button and delete class buttons