Merge branch 'bcrypt-auth' into 'develop'