refactor tokens parsing
Merge branch 'master' of github.com:fhirbase/fhirplace

Conflicts:
	test/fhirplace/search_test.clj