updated rails dependency for rails4
Merge remote-tracking branch 'geraudmathe/master'