Fixed exporttoJSON to support OMOP CDM v4 and CDMv5
Merge branch 'develop' of https://github.com/OHDSI/Achilles into develop

Conflicts:
	R/exportToJson.R