- ZSDatabase uses the singleton pattern now
- Class descriptions for doxygen added
- All 3 branches merged together!