Fix compile issues and keep working on android build

hapi-fhir-android/pom.xml

@@ -38,13 +38,11 @@
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu</artifactId>
 			<version>1.2-SNAPSHOT</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2</artifactId>
 			<version>1.2-SNAPSHOT</version>
-			<scope>test</scope>
 		</dependency>
 		<!--
 		<dependency>
@@ -115,7 +113,7 @@
 				<artifactId>maven-failsafe-plugin</artifactId>
 				<version>${maven_failsafe_plugin_version}</version>
 				<configuration>
-					<classpathDependencyScopeExclude>compile+runtime+test</classpathDependencyScopeExclude>
+					<classpathDependencyScopeExclude>compile+runtime+test+provided</classpathDependencyScopeExclude>
 					<additionalClasspathElements>
 						<additionalClasspathElement>${project.build.directory}/hapi-fhir-android-${project.version}-dstu2.jar</additionalClasspathElement>
 					</additionalClasspathElements>

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java

@@ -1643,7 +1643,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
 		}
 
 		@Override
-		public IClientExecutable returnBundle(Class theClass) {
+		public IQuery returnBundle(Class theClass) {
 			if (theClass == null) {
 				throw new NullPointerException("theClass must not be null");
 			}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java

@@ -74,6 +74,6 @@ public interface IQuery<T> extends IClientExecutable<IQuery<T>, T>, IBaseQuery<I
 	 * Request that the client return the specified bundle type, e.g. <code>org.hl7.fhir.instance.model.Bundle.class</code>
 	 * or <code>ca.uhn.fhir.model.dstu2.resource.Bundle.class</code>
 	 */
-	<B extends IBaseBundle> IClientExecutable<IQuery<B>, B> returnBundle(Class<B> theClass);
+	<B extends IBaseBundle> IQuery<B> returnBundle(Class<B> theClass);
 	
 }

src/changes/changes.xml

@@ -76,6 +76,9 @@
 				Avoid crash when parsing if an invalid child element is found in 
 				a resource reference.
 			</action>
+			<action type="add">
+				Create new android specialty libraries for DSTU1 and DSTU2
+			</action>
 		</release>
 		<release version="1.1" date="2015-07-13">
 			<action type="add">