fixed conversations views bug
Merge branch 'master' into capybara