change-to-gemfile.lock
change-to-gemfile.lock
Merge remote-tracking branch 'origin/redactor' into redactor