messages now are in conversations
conversations stuff updated
Merge branch 'messages'
sorted the edit page
added test
zzz
merge fix