reset password changes
Merge branch 'master' of https://github.com/Alivebox/aliveTracker_ws