Merge branch 'master' of github.com:jamesagnew/hapi-fhir

2015-01-09 22:02:56 -05:00 · 2015-01-09 22:02:56 -05:00 · 1063b6cf1e
parent fb5a775fbd 8e73705000
commit 1063b6cf1e
682 changed files with 4384 additions and 667 deletions
--- a/hapi-fhir-base/pom.xml
+++ b/hapi-fhir-base/pom.xml
@ -237,6 +237,7 @@
 											<include>org.codehaus.woodstox:stax2-api</include>
 											<include>org.slf4j:slf4j*</include>
 											<include>org.apache.commons:*</include>
+											<include>org.apache.httpcomponents:*</include>
 										</includes>
 									</artifactSet>
 									<relocations>
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementCompositeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementCompositeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ConfigurationException.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ConfigurationException.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IRuntimeDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IRuntimeDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ProvidedResourceScanner.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ProvidedResourceScanner.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildAny.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildAny.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeBoundDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeBoundDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildContainedResources.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildContainedResources.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExtensionDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExtensionDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveBoundCodeDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveBoundCodeDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceBlockDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceBlockDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResources.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResources.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeExtensionDtDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeExtensionDtDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeNarrativeDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeNarrativeDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceBlockDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceBlockDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceReferenceDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceReferenceDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java
@ -8,7 +8,7 @@ import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.i18n;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseBundle.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseBundle.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseResource.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseResource.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleEntry.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleEntry.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/CodeableConceptElement.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/CodeableConceptElement.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICodeEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICodeEnum.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeDatatype.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeDatatype.java
@ -6,7 +6,7 @@ import org.hl7.fhir.instance.model.ICompositeType;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java
@ -6,7 +6,7 @@ import org.hl7.fhir.instance.model.IBase;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IExtension.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IExtension.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatype.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatype.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatypeWithPrecision.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatypeWithPrecision.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterAnd.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterAnd.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterOr.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterOr.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterType.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterType.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Include.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Include.java
@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PathSpecification.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PathSpecification.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TemporalPrecisionEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TemporalPrecisionEnum.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/DatatypeDef.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/DatatypeDef.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Description.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Description.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ProvidesResources.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ProvidesResources.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SimpleSetter.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SimpleSetter.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseContainedDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseContainedDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseQuantityDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseQuantityDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseResourceReferenceDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseResourceReferenceDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseConformance.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseConformance.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.resource;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.resource;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseSecurityEvent.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.resource;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/ResourceMetadataMap.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/ResourceMetadataMap.java
@ -1,5 +1,25 @@
 package ca.uhn.fhir.model.base.resource;

+/*
+ * #%L
+ * HAPI FHIR - Core Library
+ * %%
+ * Copyright (C) 2014 - 2015 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import java.util.HashMap;

 import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContainedDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContainedDt.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.dstu.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/NarrativeDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/NarrativeDt.java
@ -20,7 +20,7 @@ package ca.uhn.fhir.model.dstu.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java
@ -20,7 +20,7 @@ package ca.uhn.fhir.model.dstu.composite;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Binary.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Binary.java
@ -4,7 +4,7 @@ package ca.uhn.fhir.model.dstu.resource;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AddressUseEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AddressUseEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdministrativeGenderCodesEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdministrativeGenderCodesEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdmitSourceEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdmitSourceEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AggregationModeEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AggregationModeEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AlertStatusEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AlertStatusEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AnimalSpeciesEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AnimalSpeciesEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/BindingConformanceEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/BindingConformanceEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityCategoryEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityCategoryEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityStatusEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityStatusEnum.java
@ -5,7 +5,7 @@ package ca.uhn.fhir.model.dstu.valueset;
 * #%L
 * HAPI FHIR - Core Library
 * %%
- * Copyright (C) 2014 University Health Network
+ * Copyright (C) 2014 - 2015 University Health Network
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Show More
+++ b/Show More