Conversations and new conversations iteration
Merge branch 'master' of github.com:drobin03/wisp