added password reset, including view files and updated access controller
front end modal working
Conflicts resolved