Fixed integration test for capybara 2.1
Merge branch 'master' into conversations