forgot password done
cod
Merge branch 'rimal' into vaibhav