added database functionality
Merge branch 'master' of
https://github.com/kellyahergert/AdoptAFamilyOnline.git

Conflicts:
	AdoptAFamily/WebContent/aaf1_email_info.jsp
added database stuff