Conversations clenaup
Merge branch 'master' into conversations
Fixed conversations mailer
Removed conversations and improved comments
Fix capybara dependencies