Unmets favorite heart
Merge branch 'master' of https://github.com/fray88/SocialUp
Change user image and favorites
Merge conflicts