bump Rails to fix CVE-2014-7818
Merge branch 'hotfix/0.4.1.2'
Updated Gemfile.lock
Updated Gemfile.lock and Diaspora