reverting back to last known good wdm.sql
Merge branch 'master' of https://github.com/wdeanmedical/ehr

Conflicts:
	data/wdm.sql
a few FHIR datatypes