Upgraded rails to 4.1.4
Upgraded rails to 4.1.4
Merge branch 'beta'