fixed tests for capybara
Merge branch 'staging' into stubbing_user_login
fixed merge issues