Merge branch 'develop' into 'master'

cda-model/pom.xml

cdaepsos-model/pom.xml

cdaxehealth-model/pom.xml

...java/net/ihe/gazelle/model/CdaxehealthModelRetriever.java

...ava/net/ihe/gazelle/model/DatatypesIpsModelRetriever.java

...ain/java/net/ihe/gazelle/model/InfrIpsModelRetriever.java

cdaxehealth-model/src/main/resources/cdaxehealth/attrDTs.xml

...h-model/src/main/resources/cdaxehealth/choicesDefault.xml

...health-model/src/main/resources/cdaxehealth/datatypes.xml

...h-model/src/main/resources/cdaxehealth/distinguishers.xml

...model/src/main/resources/cdaxehealth/modelsDefinition.xml

...l/src/main/resources/cdaxehealth/templatesTypeMapping.xml

.../src/main/resources/datatypes-ips-model/datatypes-ips.uml

...odel/src/main/resources/datatypes-ips-model/datatypes.uml

cdaxehealth-model/src/main/resources/infr-ips-model/infr.uml

cdaxehealth-model/src/main/resources/modelxeh/cda.uml

cdaxehealth-model/src/main/resources/modelxeh/lab.uml

cdaxehealth-model/src/main/resources/modelxeh/pharm.uml

common-models/pom.xml

datatypes-model/pom.xml