updated associations in user model
Comments (after squashes)