Merge commit
Fixed conflict
Hide new messages badge if there are no new messages
Merge pull request #88 from sharetribe/feature/hide-message-badge

Hide new messages badge when there are no new messages