Merged
Made Favorite Manager
Merge branch 'test_favorite'