Updated Gemfile
Änderung FriendController
user model for heroku
some changes