update gemfile for rails 4
Merge branch 'develop'