Merged with the latest master snapshot.

hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dev/FhirDev.java

@@ -108,7 +108,7 @@ public class FhirDev implements IFhirVersion {
 	}
 
 
-	@Override
+	//@Override
 	public IBaseExtension<?> newExtension() {
 		return null;
 	}

hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java

@@ -380,7 +380,7 @@ public class FhirDstu1 implements IFhirVersion {
 		return ContainedDt.class;
 	}
 
-	@Override
+	//@Override
 	public IBaseExtension<?> newExtension() {
 		return null;
 	}

hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java

@@ -93,7 +93,7 @@ public class FhirDstu2 implements IFhirVersion {
 		throw new UnsupportedOperationException();
 	}
 
-	@Override
+	//@Override
 	public IBaseExtension<?> newExtension() {
 		return null;
 	}