Added favorites
Merge branch 'favorites'