trying to force a conflict during merge
Merge branch 'master' into develop

Conflicts:
	pom.xml
point back to snapshot for dev work
Merge branch 'master' into develop
update DB version refs
Merge branch 'develop' of https://github.com/Apelon-VA/ISAAC-DB into develop
Get right mixture of classifier and type to work with archetype.
add a logging configuration to the build process
Revert "Get right mixture of classifier and type to work with archetype."

This reverts commit e7b910cdee96d24acb9cea41969554328bcd7cb6.
include the logging config in the artifact
Put DB builds back the way they were with "bdb" classifier and file-ending active-only.bdb.zip
TASK 10: final changes to database classifier/type
Merge branch 'develop' of https://github.com/Apelon-VA/ISAAC-DB.git into develop

Conflicts:
	solor-all/pom.xml
	solor-all/src/assembly/assembly.xml
	solor-snomed-active-only/pom.xml
TASK 6: restore all paths.
Merge branch 'develop' of https://github.com/Apelon-VA/ISAAC-DB into develop
create a property for specifying the end classifier, fix packaging issue
with lucene indexes.
Add econcepts file for testing
Merge branch 'develop' of https://github.com/Apelon-VA/ISAAC-DB into develop
bump version for new release
just comments