rails -> 4.0.5
Merge branch 'master' into survi