new rails version
Merge pull request #591 from mib32/rails4

new rails version