added reset password function
Merge branch 'development'