Cleaning up JavaDocs to allow building in Java 8
Merge branch 'master' of github.com:jamesagnew/hapi-fhir

Conflicts:
	pom.xml