Fix merge conflicts

Merge branch 'Onaracs-feature/facebook_friends'
Invite friends functionality working