Redundancy
Merge branch 'master' of github.com:ConversationDevelopers/conversation
Add queries to conversation list
Merge branch 'master' of github.com:ConversationDevelopers/conversation