Merge pull request #267 from jasnow/master

Updated Gemfile.lock file
Updated i18n
Gem updates
Gem updates
Refresh Gemfile.lock file to fix conflict