password reset not working
Merge branch 'master' of https://github.com/sotch-pr35mac/adswithfriends