Forgotten Password Done
Edit Password Fixed
Merge origin/master