Property file which indicates email list for pet adoptions, email
account settings, and email subject value
new files
bunch of modified files.  This is a really poor merge on my part.  I did too much refactoring and moving stuff around without commiting
Files either rename or moved into other projects