Merge branch 'hotfix/2012-01-08-r2'
Merge branch 'release/2012-01-08-r3'
Merge branch 'release/2012-01-17-r1'
Merge branch 'release/2012-04-29-r1'
Updates Rails version for Heroku

In response to their email.
Merge branch 'hotfix/2013-01-10-r1' into develop