Merge branch 'master' into eduard-final-1
Test Case: Delete Favorite
Merge branch 'eduard-final-1'