Merge branch 'master' into more_properties

# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
#	src/main/resources/hapi.properties

src/main/resources/hapi.properties

@@ -1,7 +1,19 @@
+
+# Adjust this to set the version of FHIR supported by this server. See
+# FhirVersionEnum for a list of available constants.
 fhir_version=DSTU3
+
+# This is the address that the FHIR server will report as its own address.
+# If this server will be deployed (for example) to an internet accessible
+# server, put the DNS name of that server here.
+server_address=http://localhost/fhir/
+
+# This is the context path for the FHIR endpoint. If this is changed, the
+# setting above should also be changed.
+server.base=/fhir
+
 default_encoding=JSON
 etag_support=ENABLED
-server_address=http://mydomain.com/fhir/baseDstu3
 default_page_size=20
 max_page_size=200
 allow_multiple_delete=true
@@ -17,7 +29,6 @@ datasource.driver=org.apache.derby.jdbc.EmbeddedDriver
 datasource.url=jdbc:derby:directory:target/jpaserver_derby_files;create=true
 datasource.username=
 datasource.password=
-server.base=/baseDstu3
 server.name=Local Tester
 server.id=home
 test.port=