rails4.1化
Merge branch 'master' of https://github.com/mudai/fly