Merge branch 'hotfix/1.2.6'
add bcrypt-ruby to gemfile
Merge branch 'hotfix/1.2.7' into develop