Add method 'friend_users' to User model
Merge branch 'friends'