added user_avatar method to user model. can be called to show either uploaded or default avatar. also added image and name links of the other person in the chatroom to the top of the chat page
merge conflicts