Minor Fixes
Merge remote-tracking branch 'sonali/master' into dev
Fixed edit video
Merge remote-tracking branch 'upstream/master'
Add photo done
Minor fix
Conflict managed
Major Fixes

Photo edit and delete functionalities fixed
Merge Commit