Finished commenting
Merging branches and Finished commenting on FavoritesActivity