Update the Gemfile.lock
Merge branch 'devel' into feature/email_tokens_in_rails_cache