Updates rails version to due to security reasons
Fixes an incompatibility with the last rails version
Merge branch 'staging' into production