Database class can now save .json files
Typo
Merge JSON-export into master