Version bump Ruby to 2.1.5
Version bump rails to 4.2.0
Resolve merge conflict