adding scope to models
added controller actions to conversations
Merge branch 'add-conversation-functionality'