Reset Password and pre-search and search fixes
Merge branch 'master' of https://github.com/Bergx2/boatopoly2