updated Gemfile
Merge branch 'rails4' of github.com:next-l/enju_resource_merge into rails4