add password recovery
Merge remote-tracking branch 'origin/master'
build
Merge remote-tracking branch 'origin/master'