add new rails installation

Marge master2 into master (new rails installation)