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

pom.xml

@@ -2063,7 +2063,7 @@
 					</reportsDirectories>
 				</configuration>
 			</plugin>
-			<!--<plugin>
+			<!--			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<version>3.0.0</version>
@@ -2071,14 +2071,15 @@
 				<reportSets>
 					<reportSet>
 						<reports>
-							<report>project-team</report>
+							<report>team</report>
-							<report>issue-tracking</report>
+							<report>issue-management</report>
 							<report>license</report>
 							<report>scm</report>
 						</reports>
 					</reportSet>
 				</reportSets>
-			</plugin>-->
+			</plugin>
+			-->
 			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId> <version>1.1</version> </plugin> -->
 		</plugins>
 	</reporting>

src/site/xdoc/download.xml.vm

@@ -204,13 +204,13 @@
 						<td style="background: #EEB;">3.4.0-13732</td>
 					</tr>
 					<tr>
-						<td>HAPI FHIR 3.4.0</td>
+						<td>HAPI FHIR 3.6.0-SNAPSHOT</td>
 						<td>JDK8</td>
 						<td style="background: #DDD;"></td>
 						<td style="background: #CEC;">1.0.2</td>
 						<td style="background: #EEB;">1.4.0</td>
 						<td style="background: #CEC;">3.0.1</td>
-						<td style="background: #EEB;">3.6.0-13732</td>
+						<td style="background: #EEB;">3.6.0-1202b2eed0f</td>
 					</tr>
 		</tbody>
 			</table>