added password reset functionality
Merge branches 'master' and 'ildph'