Merge pull request #285 from pmq20/master

Upgrade Rails to 4.1.0
Merge remote-tracking branch 'upstream/master'