Merge branch 'release-1.0.0' into develop
log4j extras
merge procavia-log/develop back to procavia-log-akwan/develop
try forcing log4j version 1.2.17
set version to 1.1.1
Merge branch 'release-1.1.1'