forgot some changes last commit. Namely, adding functionality to the page. :P This time's for real.
ran into an exception on passwordReset.xhtml I overlooked. Fixed.
did layout of passwordReset page
resolved merge conflicts
login system now works