Merging chat fix on dev branch with solving conflicts. However you need to have look on UserComparatorTest because it is failing. Looks like comparator is wrong.
Merge pull request #43 from peter-budo/chat_fix_to_dev_merge

Merging chat-list-status-fix on dev branch