Added users and user friendships with associated tests
Merge remote-tracking branch 'origin/master'