Fixed bcrypt-nodejs version
Merge dev into master