Merge branch 'master' of https://github.com/termMed/rf2-to-json-conversion

Conflicts:
	src/main/java/org/ihtsdo/json/TransformerDiskBased.java