Merge branch 'hotfix/1.6.1'
adding Gemfile.lock to repo
Merge branch 'hotfix/1.6.2' into develop