added log4j
Merge branch 'log4j'