bump Rails to fix CVE-2014-7818
Merge branch 'hotfix/0.4.1.2'
Merge branch 'master' of github.com:javierEd/diaspora into caray.net