Merge pull request #225 from raviosc/developer125

Changes For Reset PAssword
Changes For Testing
Merge remote-tracking branch 'origin/master'