updated rails version for major security fix
Merge branch 'master' into deploy