Added core response token and fixes for token enricher
Merge branch 'master' of https://github.com/jembi/ohie-xds-mediator

Conflicts:
	src/main/app/xds-mediator.properties