Config changes
Merge branch 'master' of github.com:jamesagnew/hapi-fhir
Welcome mesage change
Merge branch 'master' of github.com:jamesagnew/hapi-fhir

Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html
Merge branch 'master' of github.com:jamesagnew/hapi-fhir