added ajax for conversations and messages
fixed merge conflicts