commit changes for password reset
commit groovy file for password change
stuff
Merge branch 'master' of https://github.com/bbellanc/HeritageTrail

Conflicts:
	devDb.h2.db
	devDb.trace.db
	target/stacktrace.log
	target/work/web.xml.tmp
Merge branch 'master' of https://github.com/bbellanc/HeritageTrail
Created functionality for the settings page