config
Merge branch 'master' of github.com:jpcik/morph-web
hl7 mapping
Merge branch 'master' of github.com:jpcik/morph-web

Conflicts:
	sparqlstream-web/conf/mappings/hl7.ttl
	sparqlstream-web/project/Build.scala
hl7 mapping