User avatar and status can be pulled in notifications and threads
Updated how time is rendered in a chat
Resolved merge conflicts
Merge pull request #105 from nathantross/notificationsAvatar

Notifications avatar