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