few updates
updated
added expiry date handling on password reset
merged upstream + resolved conflicts