log4j.properties
Merge remote-tracking branch 'origin/master'
Changes to lg4j.properties