fixed delete song and delete movie
Merge remote-tracking branch 'origin/master'