merge from my local
update Gemfile.lock
Merge commit '455a574c343286cf270a8cdae4cf813933a5d223' into katoh/develop