Update rails (CVE-2014-3483)
Update gems
Merge branch 'staging'