updated gemfile.lock
Merge branch 'master' into rails4