reset password function
merge conflict
Merge branch 'queue'
housekeeping