Category delete, modified date features added
Merge conflict resolved