change password for my user
Merge remote-tracking branch 'origin/master'
fix bages