SHA-1 Encryption for customer added
Merge remote-tracking branch 'origin/master'
Reset pswd bug fixed