Updated rails to 4.1.2
Merge branch 'beta'