Merge pull request #7 from osabina/master

Pretty much everything except chat view working
Fix for multiple concurrency issues with chats/messages