Update rails version
Update selenium webdriver
Merge branch 'develop'
Merge branch 'master' of heroku.com:rubeque