Merge pull request #33 from mbathletes/andres

Andres
Updated password reset and added error 404 page
Merge branch 'master' into andres