Merge pull request #1 from regneq/submaster

Submaster
re-commit zonedb.cpp and revert the SavePetInfo that was causing the crash.
Merge pull request #178 from regneq/master

recommit zonedb.cpp and revert SavePetInfo that was causing the crash.