Rails upgrade from 4.0.3 to 4.1.5
Resolved conflict