minor
Merge branch 'master' of github.com:fhirbase/fhirplace

Conflicts:
	src/fhirplace/app.clj
fix tests