ignore Gemfile.lock for docker.
Merge branch 'master' into develop