release prep.  Also, reversed master/develop (renamed the release-prep
branch to develop - will now do work there, release from master)
Merge branch 'master' into develop

Conflicts:
	pom.xml
	solor-all/pom.xml
	solor-snomed-active-only/pom.xml
	solor-snomed-loinc/pom.xml
fix SCM tag
fix scm tag