tests
Merge branch 'master' of github.com:niquola/fhirbase

Conflicts:
	dev/test/views_test.sql